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

[michi at wyona.com]

Author: michi
Date: 2009-05-21 14:57:01 +0200 (Thu, 21 May 2009)
New Revision: 42976

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
return checkout 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	2009-05-21 12:35:08 UTC (rev 42975)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2009-05-21 12:57:01 UTC (rev 42976)
@@ -573,9 +573,12 @@
                                     log.warn("Resource " + res.getPath() + " is already checked out by this user: " + checkoutUserID);
                                 } else {
                                     if (isClientSupportingNeutron(request)) {
-                                        // TODO: Send back well-formed XML according to http://neutron.wyona.org/draft-neutron-protocol-v0.html#rfc.section.8.2
-                                        log.warn("Seems to be Neutron client ....");
-                                        throw new Exception("Resource '" + res.getPath() + "' is already checked out by another user: " + checkoutUserID);
+                                        String eMessage = "Resource '" + res.getPath() + "' is already checked out by another user: " + checkoutUserID;
+                                        response.setContentType("application/xml");
+                                        response.setStatus(javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+                                        // TODO: Checkout date and break-lock (optional)
+                                        response.getWriter().print(XMLExceptionV1.getCheckoutException(eMessage, res.getPath(), checkoutUserID, null));
+                                        return;
                                     } else {
                                         throw new Exception("Resource '" + res.getPath() + "' is already checked out by another user: " + checkoutUserID);
                                     }