Embeds pz2 error XML, if any, in the app error XML

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / pz2utils4jsf / pazpar2 / CommandThread.java

diff --git a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
index ea52988..95dcf1e 100644 (file)
--- a/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
+++ b/src/main/java/com/indexdata/pz2utils4jsf/pazpar2/CommandThread.java
@@ -44,8 +44,12 @@ public class CommandThread extends Thread {
       Pazpar2HttpResponse httpResponse = client.executeCommand(clientCommand, baos);\r
       if (httpResponse.getStatusCode()==200) {\r
         response.append(baos.toString("UTF-8"));  \r
+      } else if (httpResponse.getStatusCode()==417) {\r
+        logger.error("Pazpar2 status code 417: " + baos.toString("UTF-8"));\r
+        response.append(CommandError.insertPazpar2ErrorXml(command.getName(), "Expectation failed (417)", baos.toString("UTF-8")));        \r
       } else {\r
         String resp = baos.toString("UTF-8");\r
+        logger.error("Pazpar2 status code was " + httpResponse.getStatusCode() + ": " + resp);\r
         throw new Pazpar2ErrorException(resp,httpResponse.getStatusCode(),resp,null);\r
       }       \r
       long end = System.currentTimeMillis();      \r