diff options
author | mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2010-05-05 15:29:01 +0000 |
---|---|---|
committer | mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2010-05-05 15:29:01 +0000 |
commit | b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd (patch) | |
tree | 0883f08a408f89f758e9a1be629232e3dd055c3a /smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java | |
parent | 83a9b613836910f7edc370c2fe60fa2268dc4461 (diff) | |
download | mocca-b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd.tar.gz mocca-b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd.tar.bz2 mocca-b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd.zip |
Merged feature branch mocca-1.2.13-id@r724 back to trunk.
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat (limited to 'smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java')
-rw-r--r-- | smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java index 5b436d16..52804f79 100644 --- a/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java +++ b/smccSTAL/src/main/java/at/gv/egiz/bku/smccstal/SignRequestHandler.java @@ -27,8 +27,8 @@ import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import at.gv.egiz.smcc.CancelledException; import at.gv.egiz.smcc.LockedException; @@ -47,14 +47,15 @@ import at.gv.egiz.stal.signedinfo.SignedInfoType; public class SignRequestHandler extends AbstractRequestHandler { - private static Log log = LogFactory.getLog(SignRequestHandler.class); + private final Logger log = LoggerFactory.getLogger(SignRequestHandler.class); private static JAXBContext jaxbContext; static { try { jaxbContext = JAXBContext.newInstance(ObjectFactory.class.getPackage().getName()); } catch (JAXBException e) { - log.fatal("Cannot init jaxbContext", e); + Logger log = LoggerFactory.getLogger(SignRequestHandler.class); + log.error("Cannot init jaxbContext", e); } } @@ -75,7 +76,7 @@ public class SignRequestHandler extends AbstractRequestHandler { InputStream is = new ByteArrayInputStream(signReq.getSignedInfo()); JAXBElement<SignedInfoType> si = (JAXBElement<SignedInfoType>) unmarshaller.unmarshal(is); String signatureMethod = si.getValue().getSignatureMethod().getAlgorithm(); - log.debug("Found signature method: " + signatureMethod); + log.debug("Found signature method: {}.", signatureMethod); KeyboxName kb = SignatureCard.KeyboxName.getKeyboxName(signReq.getKeyIdentifier()); byte[] resp = card.createSignature(new ByteArrayInputStream(signReq.getSignedInfo()), kb, @@ -101,7 +102,7 @@ public class SignRequestHandler extends AbstractRequestHandler { BKUGUIFacade.MESSAGE_WAIT); return new ErrorResponse(6001); } catch (CancelledException cx) { - log.debug("User cancelled request"); + log.debug("User cancelled request."); return new ErrorResponse(6001); } catch (TimeoutException ex) { log.error("Timeout during pin entry"); @@ -116,14 +117,14 @@ public class SignRequestHandler extends AbstractRequestHandler { log.error("Error while creating signature: " + e); return new ErrorResponse(4000); } catch (JAXBException e) { - log.error("Cannot unmarshall signed info", e); + log.error("Cannot unmarshall signed info.", e); return new ErrorResponse(1000); } catch (IOException e) { log.error("Error while creating signature: " + e); return new ErrorResponse(4000); } } else { - log.fatal("Got unexpected STAL request: " + request); + log.error("Got unexpected STAL request: {}.", request); return new ErrorResponse(1000); } } |