You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2012/08/17 14:47:08 UTC

svn commit: r1374228 - /jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java

Author: stefan
Date: Fri Aug 17 12:47:07 2012
New Revision: 1374228

URL: http://svn.apache.org/viewvc?rev=1374228&view=rev
Log:
OAK-254: waitForCommit returns null in certain situations

Modified:
    jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java

Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java?rev=1374228&r1=1374227&r2=1374228&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java Fri Aug 17 12:47:07 2012
@@ -67,12 +67,20 @@ public class MicroKernelImpl implements 
      */
     public MicroKernelImpl(Repository rep) {
         this.rep = rep;
+        try {
+            // initialize commit gate with current head
+            gate.commit(rep.getHeadRevision().toString());
+        } catch (Exception e) {
+            throw new MicroKernelException(e);
+        }
     }
 
     protected void init(String homeDir) throws MicroKernelException {
         try {
             rep = new Repository(homeDir);
             rep.init();
+            // initialize commit gate with current head
+            gate.commit(rep.getHeadRevision().toString());
         } catch (Exception e) {
             throw new MicroKernelException(e);
         }