Refactored STAL interface. Additional infobox functionality.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@236 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

1 files changed, 8 insertions, 1 deletions

diff --git a/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java b/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
index b70b44a7..b1866894 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
@@ -16,6 +16,7 @@
 */
 package at.gv.egiz.smcc.util;

 

+import java.security.NoSuchAlgorithmException;
 import java.util.Collections;

 import java.util.HashMap;

 import java.util.List;

@@ -54,7 +55,13 @@ public class SmartCardIO {
   CardTerminals cardTerminals_;

 

   private void updateTerminalFactory() {

-    TerminalFactory terminalFactory = TerminalFactory.getDefault();

+    TerminalFactory terminalFactory;
+    try {
+      terminalFactory = TerminalFactory.getInstance("PC/SC", null);
+    } catch (NoSuchAlgorithmException e) {
+      log.info("Failed to get TerminalFactory of type 'PC/SC'.", e);
+      terminalFactory = TerminalFactory.getDefault();
+    }

     log.debug("TerminalFactory : " + terminalFactory);

     if ("PC/SC".equals(terminalFactory.getType())) {

       terminalFactory_ = terminalFactory;