jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1339656 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
Date Thu, 17 May 2012 15:38:57 GMT
Author: mduerig
Date: Thu May 17 15:38:56 2012
New Revision: 1339656

URL: http://svn.apache.org/viewvc?rev=1339656&view=rev
Log:
OAK-102: Expose the branch feature from NodeStore
- fixed potential NPE

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java?rev=1339656&r1=1339655&r2=1339656&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
Thu May 17 15:38:56 2012
@@ -120,9 +120,9 @@ class KernelNodeStoreBranch implements N
         purge(buildJsop());
         // TODO rebase, call commitHook (OAK-100)
         MicroKernel kernel = getKernel();
-        String mergedRevision = null;
+        String mergedRevision;
         try {
-            kernel.merge(branchRevision, null);
+            mergedRevision = kernel.merge(branchRevision, null);
             branchRevision = null;
             currentRoot = null;
             committed = null;



Mime
View raw message