[Yanel-commits] rev 57319 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

michi at wyona.com michi at wyona.com
Tue Mar 15 10:26:24 CET 2011


Author: michi
Date: 2011-03-15 10:26:23 +0100 (Tue, 15 Mar 2011)
New Revision: 57319

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
misleading neutron exception replaced by workflow exception

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-03-15 09:13:15 UTC (rev 57318)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2011-03-15 09:26:23 UTC (rev 57319)
@@ -790,8 +790,7 @@
                 response.setContentType("application/xml; charset=" + DEFAULT_ENCODING);
                 response.setStatus(javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
                 PrintWriter w = response.getWriter();
-                // TODO: XMLExceptionV1 is part of Neutron and hence not really appropriate for this kind of exception
-                w.print(XMLExceptionV1.getDefaultException(XMLExceptionV1.AUTHORIZATION, e.getMessage()));
+                w.print(getWorkflowException(e.getMessage()));
                 return;
             }
         } else {
@@ -2583,4 +2582,16 @@
         }
         return false;
     }
+
+    /**
+     * Get workflow exception
+     */
+    private static String getWorkflowException(String message) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("<?xml version=\"1.0\"?>");
+        sb.append("<exception xmlns=\"http://www.wyona.org/yanel/workflow/1.0\" type=\"" + "workflow" + "\">");
+        sb.append("<message>" + message + "</message>");
+        sb.append("</exception>");
+        return sb.toString();
+    }
 }



More information about the Yanel-commits mailing list