1 files changed, 11 insertions, 6 deletions
diff --git a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java
index a85917d81..2e82d4d32 100644
--- a/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java
+++ b/spss.slinterface/WEB-INF/src/at/gv/egovernment/moa/spss/slinterface/transformers/MOA2SL.java
@@ -10,6 +10,7 @@ import java.util.HashMap;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import at.gv.egovernment.moa.spss.slinterface.Constants;
@@ -73,14 +74,18 @@ public class MOA2SL
     nsTransforms.clear();
     nsTransforms.put(Constants.NSURI_SL_11_, Constants.NSURI_SL_10_);
     nameTransforms.clear();
-    NodeList signatureCheckChildren = signatureCheckElem.getElementsByTagName("*");
-    ArrayList signatureCheckChildrenList = new ArrayList(signatureCheckChildren.getLength());
-    for (int i = 0; i < signatureCheckChildren.getLength(); i++) 
+    Element certCheckElem = (Element) verifyResponseElem.getElementsByTagNameNS(
+      Constants.NSURI_SL_11_, "CertificateCheck").item(0);
+    NodeList certCheckChildren = certCheckElem.getChildNodes();
+    ArrayList certCheckChildElemsList = new ArrayList(certCheckChildren.getLength());
+    for (int i = 0; i < certCheckChildren.getLength(); i++) 
     {
-      signatureCheckChildrenList.add(signatureCheckChildren.item(i));
+      Node currentNode = certCheckChildren.item(i);
+      if (currentNode.getNodeType() == Node.ELEMENT_NODE)
+      certCheckChildElemsList.add(certCheckChildren.item(i));
     } 
-    for (int i = 0; i < signatureCheckChildrenList.size(); i++)
-      Utils.transformDeep((Element) signatureCheckChildrenList.get(i), prefixMap, nsTransforms, 
+    for (int i = 0; i < certCheckChildElemsList.size(); i++)
+      Utils.transformDeep((Element) certCheckChildElemsList.get(i), prefixMap, nsTransforms, 
         nameTransforms);      
       
     return moaVerifyXMLSignatureResponse;