Daily merge.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2882 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java

@@ -90,6 +90,9 @@ public abstract class BaseDialogBean implements IDialogBean
          }
          catch (Throwable e)
          {
+            // reset the flag so we can re-attempt the operation
+            isFinished = false;
+            
             // rollback the transaction
             try { if (tx != null) {tx.rollback();} } catch (Exception ex) {}
             Utils.addErrorMessage(formatErrorMessage(e));