Minor bug fixed: Signature device support should be checked before evaluating ErrorResponse.

git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@345 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c

2 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
index 100f054..19ffb7a 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/bku/DetachedBKUConnector.java
@@ -126,8 +126,6 @@ public class DetachedBKUConnector implements Connector, LocalConnector
 

     String response_string = response_properties.getProperty(BKUPostConnection.RESPONSE_STRING_KEY);

 

-    BKUHelper.checkResponseForError(response_string);

-

     String bkuIdentifier = BKUHelper.getBKUIdentifier(response_properties);

     log.debug("BKU identifier: \"" + bkuIdentifier + "\"");

     

@@ -138,6 +136,8 @@ public class DetachedBKUConnector implements Connector, LocalConnector
        throw new ConnectorException(e.getErrorCode(), e.getMessage());

     }

     

+    BKUHelper.checkResponseForError(response_string);

+

     SignSignatureObject so = sigLayout.parseCreateXMLSignatureResponse(response_string);

 

     so.response_properties = response_properties;

diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
index b27edde..bcf40fc 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/sig/connectors/mocca/LocRefDetachedMOCCAConnector.java
@@ -129,7 +129,6 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
    public SignSignatureObject analyzeSignResponse(Properties response_properties) throws ConnectorException {

       log.debug("analyzeSignResponse:"); 

       String response_string = response_properties.getProperty(BKUPostConnection.RESPONSE_STRING_KEY);

-      BKUHelper.checkResponseForError(response_string);

       

       String bkuIdentifier = BKUHelper.getBKUIdentifier(response_properties);

       log.debug("BKU identifier: \"" + bkuIdentifier + "\"");

@@ -140,6 +139,8 @@ public class LocRefDetachedMOCCAConnector implements Connector, LocalConnector {
          throw new ConnectorException(e.getErrorCode(), e.getMessage());

       }

       

+      BKUHelper.checkResponseForError(response_string);

+      

 //      SignSignatureObject so = MOCCAHelper.parseCreateXMLResponse(response_string, new DetachedMOCIdFormatter());

       SignSignatureObject so = sigLayout.parseCreateXMLSignatureResponse(response_string);

       so.response_properties = response_properties;