[Yanel-commits] rev 42981 -
public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet
michi at wyona.com
michi at wyona.com
Thu May 21 22:02:01 CEST 2009
Author: michi
Date: 2009-05-21 22:02:01 +0200 (Thu, 21 May 2009)
New Revision: 42981
Modified:
public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
try and catch moved closer to the actual action
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 14:12:32 UTC (rev 42980)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java 2009-05-21 20:02:01 UTC (rev 42981)
@@ -260,21 +260,20 @@
if (ResourceAttributeHelper.hasAttributeImplemented(resource, "Versionable", "2")) {
VersionableV2 versionable = (VersionableV2)resource;
- try {
- // TODO: Compare the users
String checkoutUserID = versionable.getCheckoutUserID();
String userID = getEnvironment(request, response).getIdentity().getUsername();
if (checkoutUserID.equals(userID)) {
- versionable.cancelCheckout();
+ try {
+ versionable.cancelCheckout();
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ throw new ServletException("Releasing the lock of '" + resource.getPath() + "' failed because of: " + e.getMessage(), e);
+ }
} else {
String eMessage = "Releasing the lock of '" + resource.getPath() + "' failed because checkout user '" + checkoutUserID + "' and session user '" + userID + "' are not the same!";
log.warn(eMessage);
throw new ServletException(eMessage);
}
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- throw new ServletException("Releasing the lock of '" + resource.getPath() + "' failed because of: " + e.getMessage(), e);
- }
}
return;
} else if (value != null && value.equals("roll-back")) {
More information about the Yanel-commits
mailing list