diff --git a/source/java/hibernate.cfg.xml b/source/java/hibernate.cfg.xml
index b0f88c8dea..c80394e933 100644
--- a/source/java/hibernate.cfg.xml
+++ b/source/java/hibernate.cfg.xml
@@ -17,7 +17,7 @@
 	<property name="dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>
 <!-- <property name="dialect">org.hibernate.dialect.PostgreSQLDialect</property> -->
   	<property name="show_sql">false</property>
-    <property name="order_updates">true</property>
+    <property name="order_updates">false</property>
   	<property name="connection.isolation">2</property>
 
 <!--
diff --git a/source/java/org/alfresco/repo/avm/AVMTester.java b/source/java/org/alfresco/repo/avm/AVMTester.java
index 56a0346d6f..9538546175 100644
--- a/source/java/org/alfresco/repo/avm/AVMTester.java
+++ b/source/java/org/alfresco/repo/avm/AVMTester.java
@@ -195,6 +195,7 @@ class AVMTester implements Runnable
     {
         try
         {
+            long threadID = Thread.currentThread().getId();
             long startTime = System.currentTimeMillis();
             for (int i = 0; i < fOpCount; i++)
             {
@@ -206,7 +207,7 @@ class AVMTester implements Runnable
                 {
                     return;
                 }
-                System.out.print(fID + ":" + i + ":");
+                System.out.print(threadID + ":" + i + ":");
                 int which = fgRandom.nextInt(fOpTable.length);
                 switch (fOpTable[which])
                 {
diff --git a/source/java/org/alfresco/repo/avm/ChildEntryImpl.java b/source/java/org/alfresco/repo/avm/ChildEntryImpl.java
index 989cc0df87..d777bd0691 100644
--- a/source/java/org/alfresco/repo/avm/ChildEntryImpl.java
+++ b/source/java/org/alfresco/repo/avm/ChildEntryImpl.java
@@ -42,6 +42,11 @@ public class ChildEntryImpl implements ChildEntry, Serializable
      */
     private AVMNode fChild;
     
+    /**
+     * The Optimistic lock version
+     */
+    private long fVers;
+    
     /**
      * Default constructor for Hibernate.
      */
@@ -145,4 +150,20 @@ public class ChildEntryImpl implements ChildEntry, Serializable
     {
         return fName.hashCode() + fParent.hashCode();
     }
+
+    /**
+     * @return the vers
+     */
+    protected long getVers()
+    {
+        return fVers;
+    }
+
+    /**
+     * @param vers the vers to set
+     */
+    protected void setVers(long vers)
+    {
+        fVers = vers;
+    }
 }
diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
index 3569e03d0a..78a61477b6 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVM.hbm.xml
@@ -148,7 +148,7 @@
 			column="root_id" not-null="true">
 		</many-to-one>
 	</class>
-	<class name="ChildEntryImpl" proxy="ChildEntry" table="child_entries">
+	<class name="ChildEntryImpl" proxy="ChildEntry" table="child_entries" optimistic-lock="version">
 		<cache usage="read-write"/>
 		<composite-id>
 			<key-property name="name" type="string" column="name">
@@ -156,6 +156,7 @@
 			<key-many-to-one name="parent" column="parent_id" class="DirectoryNodeImpl">
 			</key-many-to-one>
 		</composite-id>
+		<version name="vers" column="vers" type="long"/>
 		<many-to-one name="child" column="child_id" class="AVMNodeImpl"
 			not-null="true">
 		</many-to-one>
diff --git a/source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java b/source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java
index 1d1345dbde..2742565755 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/HibernateTxn.java
@@ -115,22 +115,22 @@ public class HibernateTxn
                         if (t instanceof StaleStateException)
                         {
                             System.err.println("Lost Race");
-//                            StackTraceElement [] stack = t.getStackTrace();
-//                            long threadID = Thread.currentThread().getId();
-//                            for (StackTraceElement frame : stack)
-//                            {
-//                                System.err.println(threadID + " " + frame);
-//                            }
+                            StackTraceElement [] stack = t.getStackTrace();
+                            long threadID = Thread.currentThread().getId();
+                            for (StackTraceElement frame : stack)
+                            {
+                                System.err.println(threadID + " " + frame);
+                            }
                         }
                         else
                         {
                             System.err.println("Deadlock");
-//                            StackTraceElement [] stack = t.getStackTrace();
-//                            long threadID = Thread.currentThread().getId();
-//                            for (StackTraceElement frame : stack)
-//                            {
-//                                System.err.println(threadID + " " + frame);
-//                            }
+                            StackTraceElement [] stack = t.getStackTrace();
+                            long threadID = Thread.currentThread().getId();
+                            for (StackTraceElement frame : stack)
+                            {
+                                System.err.println(threadID + " " + frame);
+                            }
                             try
                             {
                                 long interval;