aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java33
1 files changed, 18 insertions, 15 deletions
diff --git a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
index e675a40d6..4642593eb 100644
--- a/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
+++ b/spss.server/src/at/gv/egovernment/moa/spss/server/invoke/XMLSignatureVerificationInvoker.java
@@ -363,16 +363,19 @@ public class XMLSignatureVerificationInvoker {
DataObjectFactory factory = DataObjectFactory.getInstance();
DataObject dataObject;
Iterator iter;
-
- for (iter = supplements.iterator(); iter.hasNext();) {
- XMLDataObjectAssociation supplement =
- (XMLDataObjectAssociation) iter.next();
- dataObject =
- factory.createFromXmlDataObjectAssociation(supplement, true, false);
- dataObjectList.add(dataObject);
+
+ if (supplements != null) {
+ for (iter = supplements.iterator(); iter.hasNext();) {
+ XMLDataObjectAssociation supplement =
+ (XMLDataObjectAssociation) iter.next();
+ dataObject =
+ factory.createFromXmlDataObjectAssociation(supplement, true, false);
+ dataObjectList.add(dataObject);
+ }
}
-
+
return dataObjectList;
+
}
/**
@@ -392,9 +395,11 @@ public class XMLSignatureVerificationInvoker {
TransactionContextManager.getInstance().getTransactionContext();
ConfigurationProvider config = context.getConfiguration();
List supplementProfiles = request.getSupplementProfiles();
-
- if (supplementProfiles != null) {
- List supplements = new ArrayList();
+
+ List supplements = new ArrayList();
+
+ if (supplementProfiles != null) {
+
List mappedProfiles =
ProfileMapper.mapSupplementProfiles(supplementProfiles, config);
Iterator iter;
@@ -404,11 +409,9 @@ public class XMLSignatureVerificationInvoker {
(SupplementProfileExplicit) iter.next();
supplements.add(profile.getSupplementProfile());
}
-
- return supplements;
+
}
-
- return null;
+ return supplements;
}
/**