svn commit: r567440 - /lenya/trunk/src/modules/webdav/webdav.js

Author: andreas
Date: Sun Aug 19 10:30:12 2007
New Revision: 567440

URL: http://svn.apache.org/viewvc?view=rev&rev=567440
Log:
Consider preconditions when advancing usecase state in webdav.js (avoid state machine exceptions)

Modified:
    lenya/trunk/src/modules/webdav/webdav.js

Modified: lenya/trunk/src/modules/webdav/webdav.js
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/webdav/webdav.js?view=diff&rev=567440&r1=567439&r2=567440
==============================================================================
--- lenya/trunk/src/modules/webdav/webdav.js (original)
+++ lenya/trunk/src/modules/webdav/webdav.js Sun Aug 19 10:30:12 2007
@@ -162,6 +162,8 @@
     var usecase;
     var sourceUrl;
     
+    var preconditionsOk;
+    
     if (cocoon.log.isDebugEnabled())
        cocoon.log.debug("usecases.js::executeUsecase() called, parameter lenya.usecase = [" + usecaseName + "]");
     
@@ -180,7 +182,10 @@
         passRequestParameters(flowHelper, usecase);
         passRequestHeaders(flowHelper, usecase);
         usecase.checkPreconditions();
-        usecase.lockInvolvedObjects();
+        preconditionsOk = !usecase.hasErrors();
+        if (preconditionsOk) {
+            usecase.lockInvolvedObjects();
+        }
         proxy = new Packages.org.apache.lenya.cms.usecase.impl.UsecaseProxy(usecase);
     }
     finally {
@@ -301,13 +306,15 @@
             usecase = usecaseResolver.resolve(sourceUrl, usecaseName);
             proxy.setup(usecase);
             
-            usecase.checkExecutionConditions();
-            if (!usecase.hasErrors()) {
-                usecase.execute();
-                if (! usecase.hasErrors()) {
-                    usecase.checkPostconditions();
+            if (preconditionsOk) {
+                usecase.checkExecutionConditions();
+                if (!usecase.hasErrors()) {
+                    usecase.execute();
                     if (! usecase.hasErrors()) {
-                        success = true;
+                        usecase.checkPostconditions();
+                        if (! usecase.hasErrors()) {
+                            success = true;
+                        }
                     }
                 }
             }