updated for wbPK

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@398 d688527b-c9ab-4aba-bd8d-4036d912da1d

1 files changed, 19 insertions, 18 deletions

diff --git a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java b/id.server/src/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java
index 4fbc58977..a952b2066 100644
--- a/id.server/src/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java
+++ b/id.server/src/at/gv/egovernment/moa/id/auth/parser/ErrorResponseParser.java
@@ -6,7 +6,6 @@ import java.io.InputStream;
 import org.w3c.dom.Element;
 
 import at.gv.egovernment.moa.id.ParseException;
-import at.gv.egovernment.moa.util.Constants;
 import at.gv.egovernment.moa.util.DOMUtils;
 import at.gv.egovernment.moa.util.XPathUtils;
 
@@ -18,20 +17,6 @@ import at.gv.egovernment.moa.util.XPathUtils;
  */
 
 public class ErrorResponseParser {
-  //
-  // XPath namespace prefix shortcuts
-  //
-  /** Xpath prefix for reaching SecurityLayer 1.0 Namespaces */
-  private static final String SL10 = Constants.SL10_PREFIX + ":";
-  /** Xpath expression to the root element */
-  private static final String ROOT = "/" + SL10 + "ErrorResponse/";
-  /** Xpath expression to the ErrorCode element */
-  private static final String ERROR_CODE_XPATH = 
-      ROOT + SL10 + "ErrorCode";
-  /** Xpath expression to the Info element */
-  private static final String ERROR_INFO_XPATH = 
-      ROOT + SL10 + "Info";
-
 
   /** This is the root element of the XML-Document provided by the Security Layer Card */
   private Element errorElement;
@@ -72,8 +57,16 @@ public class ErrorResponseParser {
    * @return String
    */
   public String getErrorCode() {
-   
-   return XPathUtils.getElementValue(errorElement,ERROR_CODE_XPATH,null); 
+    
+    String slPrefix = errorElement.getPrefix();
+    StringBuffer sb = new StringBuffer("/"); 
+    sb.append(slPrefix);
+    sb.append(":ErrorResponse/");
+    sb.append(slPrefix);
+    sb.append(":ErrorCode");
+    String errorCodeXPath = sb.toString();
+    return XPathUtils.getElementValue(errorElement,errorCodeXPath,null); 
+    
   }		
 
   /**
@@ -82,7 +75,15 @@ public class ErrorResponseParser {
    */
   public String getErrorInfo() {
    
-   return XPathUtils.getElementValue(errorElement,ERROR_INFO_XPATH,null); 
+    String slPrefix = errorElement.getPrefix();
+    StringBuffer sb = new StringBuffer("/"); 
+    sb.append(slPrefix);
+    sb.append(":ErrorResponse/");
+    sb.append(slPrefix);
+    sb.append(":Info");
+    String errorInfoXPath = sb.toString();
+    return XPathUtils.getElementValue(errorElement,errorInfoXPath,null);
+    
   }