Changed STAL Handler from static registration to one Object per STAL instance

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

2 files changed, 4 insertions, 4 deletions

diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
index 7f3a3b1c..77a3e2ea 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -267,7 +267,7 @@ public abstract class AbstractSignatureCard implements SignatureCard {
     if (card_ != null) {
       try {
         card_.disconnect(reset);
-      } catch (CardException e) {
+      } catch (Exception e) {
         log.info("Error while resetting card", e);
       }
     }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java b/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
index 3d1fd7c7..15971497 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
@@ -49,11 +49,11 @@ public class SMCCHelper {
     update();

   }

 

-  public void update() {

+  public synchronized void update() {

     update(-1);

   }

 

-  public void update(int sleep) {

+  public synchronized void update(int sleep) {

     SignatureCardFactory factory = SignatureCardFactory.getInstance();

     if (useSWCard) {

       try {

@@ -113,7 +113,7 @@ public class SMCCHelper {
     }

   }

 

-  public SignatureCard getSignatureCard(Locale locale) {

+  public synchronized SignatureCard getSignatureCard(Locale locale) {

     if (signatureCard != null) {

       signatureCard.setLocale(locale);

     }