X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fcom%2Findexdata%2Fpz2utils4jsf%2Fpazpar2%2Fdata%2FCommandError.java;h=64080e32ca0f26c1c94697e4f1fa752972ba6632;hb=801fbed2d559e224160d473e0860dd765354569f;hp=2b5fae228ea261b2a12ac16e8dd777541fea567c;hpb=c6b02eac06fa279177b30839c38e8e99f5dc445f;p=mkjsf-moved-to-github.git

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/CommandError.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/CommandError.java
index 2b5fae2..64080e3 100644
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/CommandError.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/data/CommandError.java
@@ -4,6 +4,7 @@ import static com.indexdata.pz2utils4jsf.utils.Utils.nl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Pattern;
 
 import com.indexdata.pz2utils4jsf.errors.ErrorInterface;
 import com.indexdata.pz2utils4jsf.errors.ErrorHelper;
@@ -27,6 +28,7 @@ import com.indexdata.utils.XmlUtils;
 public class CommandError extends Pazpar2ResponseData implements ErrorInterface {
 
   private static final long serialVersionUID = 8878776025779714122L;
+  private static Pattern xmlDeclaration = Pattern.compile("<\\?xml.*\\?>");
   private ErrorCode applicationErrorCode;
   private ErrorHelper errorHelper = null;
   
@@ -88,8 +90,8 @@ public class CommandError extends Pazpar2ResponseData implements ErrorInterface
    * 
    * @param commandName The name of the command during which's execution the error was encountered
    * @param exceptionName The (possibly loosely defined) name of the exception that was thrown
-   * @param pazpar2ErrorXml The error document as created by Pazpar2 -- or, for some errors, by the 
-   *                        Pazpar2 client. 
+   * @param pazpar2ErrorXml The error document as created by Pazpar2, or the Service Proxy or 
+   *                        by the Pazpar2 client itself. 
    * @return
    */
   public static String insertPazpar2ErrorXml (String commandName, String exceptionName, String pazpar2ErrorXml) {
@@ -98,7 +100,7 @@ public class CommandError extends Pazpar2ResponseData implements ErrorInterface
     errorXml.append(" <applicationerror>"+nl);
     errorXml.append("  <commandname>" + commandName + "</commandname>"+nl);
     errorXml.append("  <exception>" + XmlUtils.escape(exceptionName) + "</exception>"+nl);    
-    errorXml.append(pazpar2ErrorXml+nl);    
+    errorXml.append(xmlDeclaration.matcher(pazpar2ErrorXml).replaceAll("")+nl);    
     errorXml.append(" </applicationerror>"+nl);
     errorXml.append("</" + commandName + ">"+nl);
     return errorXml.toString();