1 files changed, 15 insertions, 4 deletions
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
index 906abbe..c48cecd 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/invoke/CMSSignatureVerificationInvoker.java
@@ -157,7 +157,7 @@ public class CMSSignatureVerificationInvoker {
 						.getInstance();
 
 				module.setLog(new IaikLog(loggingCtx.getNodeID()));
-
+				//Logger.info(" Available: " + signature.available());
 				module.init(signature, profile, new TransactionId(context.getTransactionID()));
 
 				// input = module.getInputStream();
@@ -254,11 +254,16 @@ public class CMSSignatureVerificationInvoker {
 			TrustProfile trustProfile) throws MOAException {
 		QCSSCDResult qcsscdresult = new QCSSCDResult();
 
+		if(resultObject == null) {
+			Logger.warn("Result Object is null!");
+			return;
+		}
+		
 		CMSSignatureVerificationResult cmsResult = null;
 		List adesResults = null;
 		if (resultObject instanceof ExtendedCMSSignatureVerificationResult) {
 			ExtendedCMSSignatureVerificationResult result = (ExtendedCMSSignatureVerificationResult) resultObject;
-
+			cmsResult = result.getCMSSignatureVerificationResult();
 			adesResults = getAdESResult(result.getFormVerificationResult());
 
 			if (adesResults != null) {
@@ -274,6 +279,7 @@ public class CMSSignatureVerificationInvoker {
 		String issuerCountryCode = null;
 		// QC/SSCD check
 
+		if(cmsResult.getCertificateValidationResult() != null) {
 		List list = cmsResult.getCertificateValidationResult().getCertificateChain();
 		if (list != null) {
 			X509Certificate[] chain = new X509Certificate[list.size()];
@@ -289,7 +295,7 @@ public class CMSSignatureVerificationInvoker {
 
 			// get signer certificate issuer country code
 			issuerCountryCode = CertificateUtils.getIssuerCountry((X509Certificate) list.get(0));
-
+		}
 		}
 
 		responseBuilder.addResult(cmsResult, trustProfile, qcsscdresult.isQC(), qcsscdresult.isQCSourceTSL(),
@@ -347,11 +353,16 @@ public class CMSSignatureVerificationInvoker {
 			TrustProfile trustProfile) throws MOAException {
 		QCSSCDResult qcsscdresult = new QCSSCDResult();
 
+		if(resultObject == null) {
+			Logger.warn("Result Object is null!");
+			return;
+		}
+		
 		PDFSignatureVerificationResult cmsResult = null;
 		List adesResults = null;
 		if (resultObject instanceof ExtendedPDFSignatureVerificationResult) {
 			ExtendedPDFSignatureVerificationResult result = (ExtendedPDFSignatureVerificationResult) resultObject;
-
+			cmsResult = result.getPDFSignatureVerificationResult();
 			adesResults = getAdESResult(result.getFormVerificationResult());
 
 			if (adesResults != null) {