diff options
| author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2019-02-19 10:21:44 +0100 |
|---|---|---|
| committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2019-02-19 10:21:44 +0100 |
| commit | 33e3851a1a625e643ece64cacc8247640bd0c470 (patch) | |
| tree | a28ea122531a49a60c3b26c33d819ee2502edf69 | |
| parent | 0a694ef6ca0831053c8c89ba593e462770f76b7e (diff) | |
| download | moa-sig-33e3851a1a625e643ece64cacc8247640bd0c470.tar.gz moa-sig-33e3851a1a625e643ece64cacc8247640bd0c470.tar.bz2 moa-sig-33e3851a1a625e643ece64cacc8247640bd0c470.zip | |
fix possible NullPointerException
| -rw-r--r-- | moaSig/common/src/main/resources/resources/schemas/MOA-SPSS-3.1.2.xsd | 6 | ||||
| -rw-r--r-- | moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/moaSig/common/src/main/resources/resources/schemas/MOA-SPSS-3.1.2.xsd b/moaSig/common/src/main/resources/resources/schemas/MOA-SPSS-3.1.2.xsd index f8ad010..69834b2 100644 --- a/moaSig/common/src/main/resources/resources/schemas/MOA-SPSS-3.1.2.xsd +++ b/moaSig/common/src/main/resources/resources/schemas/MOA-SPSS-3.1.2.xsd @@ -331,17 +331,15 @@ <xsd:element name="CertificateCheck" type="CheckResultType"/> <xsd:element name="FormCheckResult" type="FormResultType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="ExtendedCertificateCheck" type="ExtendedCertificateCheckResultType" minOccurs="0" maxOccurs="1"/> - <xsd:element name="SignatureProperties" type="PDFSignatureProperties" minOccurs="0" maxOccurs="1" /> + <xsd:element name="SignatureProperties" type="PDFSignatureProperties" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> - <xsd:complexType name="PDFSignatureProperties"> <xsd:sequence> <xsd:element name="SignatureCoversFullPDF" type="xsd:boolean" minOccurs="0" maxOccurs="1"/> <xsd:element name="SignatureByteRange" type="xsd:string" minOccurs="0" maxOccurs="1"/> </xsd:sequence> </xsd:complexType> - <!--########## Verify XML Signature ### --> <!--### Verify XML Signature Request ### --> <xsd:element name="VerifyXMLSignatureRequest" type="VerifyXMLSignatureRequestType"/> @@ -601,7 +599,7 @@ <xsd:restriction base="AnyChildrenType"> <xsd:sequence> <xsd:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> - <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/> + <xsd:element name="FailedReference" type="xsd:positiveInteger" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> </xsd:restriction> </xsd:complexContent> diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java index cca9117..74491d8 100644 --- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java +++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/logging/IaikLogFactory.java @@ -24,6 +24,7 @@ package at.gv.egovernment.moa.spss.server.logging; +import at.gv.egovernment.moaspss.logging.LoggingContext; import at.gv.egovernment.moaspss.logging.LoggingContextManager; import iaik.logging.Log; import iaik.logging.LogConfigurationException; @@ -52,10 +53,12 @@ public class IaikLogFactory extends LogFactory { * @return The <code>iaik.logging.Log</code> object to log messages to. */ private Log getInstanceImpl() { - String nodeID = - LoggingContextManager.getInstance().getLoggingContext().getNodeID(); - - return new IaikLog(nodeID); + LoggingContext context = LoggingContextManager.getInstance().getLoggingContext(); + if (context != null) + return new IaikLog(context.getNodeID()); + else + return new IaikLog("Internal"); + } public void release() { |