Merged V2.1 to HEAD

6500: Office 2003 Add-ins: Fix for AWC-1505
   6501: Fix for AWC-1361
   6502: Fixes for locking issues regrading expired content
   6503: Fix for AR-1615
   6504: WCM-444, WCM-288, WCM-735, WCM-480
   6505: WCM-498 wasn't fully fixed
   6506: Fix for AWC-1462
   6507: Fix for WCM-741 (link validation report for staging sandbox can get stuck)
   6508: AR-1650: WS Unit tests fail
   6509: Fix for WCM-751 which also solves WCM-570 - also fixed issue to allow deletion of any "broken" webprojects created due to either of those bugs.
   6510: Fix for WCM-546 (workflow history panel should be expanded by default)
   6511: Fix AWC-1128
   6512: Fixes to several to a couple of bugs found under concurrent load.
   6513: Build fix for test using an invalid noderef (now stripped out as it does not exist)
   6514: Add support for the QueryFile transact request to the IPC$ named pipe handler. Fix for AR-1687.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/repo/avm/AVMStoreImpl.java

@@ -291,11 +291,13 @@ public class AVMStoreImpl implements AVMStore, Serializable
         }
         VersionRoot versionRoot = new VersionRootImpl(this,
                                                       fRoot,
-                                                      fNextVersionID,
+                                                      fNextVersionID++,
                                                       System.currentTimeMillis(),
                                                       user,
                                                       tag,
                                                       description);
+        // Another embarassing flush needed.
+        AVMDAOs.Instance().fAVMNodeDAO.flush();
         AVMDAOs.Instance().fVersionRootDAO.save(versionRoot);
         for (AVMNode node : layeredNodes)
         {
@@ -308,7 +310,6 @@ public class AVMStoreImpl implements AVMStore, Serializable
             }
         }
         // Increment the version id.
-        fNextVersionID++;
         return snapShotMap;
     }
 
@@ -462,6 +463,8 @@ public class AVMStoreImpl implements AVMStore, Serializable
                 RawServices.Instance().getMimetypeService().guessMimetype(name),
                 -1,
                 "UTF-8"));
+        // Yet another flush.
+        AVMDAOs.Instance().fAVMNodeDAO.flush();
         ContentWriter writer = createContentWriter(AVMNodeConverter.ExtendAVMPath(path, name));
         writer.putContent(data);
     }