summaryrefslogtreecommitdiff
path: root/smcc/src/main
diff options
context:
space:
mode:
authorwbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2008-10-16 07:51:13 +0000
committerwbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2008-10-16 07:51:13 +0000
commitef8dc449ddc60008bce9264c73b4162cc487c174 (patch)
tree50df619b2a14f2747178a689a3cfc506977709b3 /smcc/src/main
parent9c6e13994a51c4dd2a2dacb86d460ff66f4ed882 (diff)
downloadmocca-ef8dc449ddc60008bce9264c73b4162cc487c174.tar.gz
mocca-ef8dc449ddc60008bce9264c73b4162cc487c174.tar.bz2
mocca-ef8dc449ddc60008bce9264c73b4162cc487c174.zip
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
Diffstat (limited to 'smcc/src/main')
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java2
-rw-r--r--smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java6
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);
}