diff options
author | tkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2012-10-02 19:38:38 +0000 |
---|---|---|
committer | tkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2012-10-02 19:38:38 +0000 |
commit | 6053457f2c36be893cacbd74f2b173d149f9efd1 (patch) | |
tree | 2ba6a7ecb78d36404a2e470f97fb5b1d3fdeb94e /smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java | |
parent | d06952f807b754359f994d684c2490eb4a731bbb (diff) | |
download | mocca-6053457f2c36be893cacbd74f2b173d149f9efd1.tar.gz mocca-6053457f2c36be893cacbd74f2b173d149f9efd1.tar.bz2 mocca-6053457f2c36be893cacbd74f2b173d149f9efd1.zip |
Also set error messages for STALExt requests
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1143 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java')
-rw-r--r-- | smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java index 0cf45a9c..ca01ffeb 100644 --- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java +++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/CardMgmtRequestHandler.java @@ -76,6 +76,14 @@ public class CardMgmtRequestHandler extends AbstractRequestHandler implements Ac */ private int currentActivationScript = 0; + private ErrorResponse errorResponse(int errorCode, String errorMessage) + { + log.error(errorMessage); + ErrorResponse err = new ErrorResponse(errorCode); + err.setErrorMessage(errorMessage); + return err; + } + @Override public STALResponse handleRequest(STALRequest request) throws InterruptedException { @@ -89,9 +97,8 @@ public class CardMgmtRequestHandler extends AbstractRequestHandler implements Ac Card icc = card.getCard(); if (icc == null) { - log.error("SignatureCard instance '{}' does not support card management requests.", - card.getClass().getName()); - return new ErrorResponse(1000); + return errorResponse(1000, "SignatureCard instance '" + + card.getClass().getName() + "' does not support card management requests."); } List<RequestScriptElement> script = ((APDUScriptRequest) request).getScript(); @@ -172,8 +179,7 @@ public class CardMgmtRequestHandler extends AbstractRequestHandler implements Ac return new APDUScriptResponse(responses); } else { - log.error("Got unexpected STAL request: {}.", request); - return new ErrorResponse(1000); + return errorResponse(1000, "Got unexpected STAL request: " + request); } } |