jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1446223 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStoreBranch.java
Date Thu, 14 Feb 2013 14:58:25 GMT
Author: angela
Date: Thu Feb 14 14:58:24 2013
New Revision: 1446223

URL: http://svn.apache.org/r1446223
Log:
fix indention

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=1446223&r1=1446222&r2=1446223&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 Feb 14 14:58:24 2013
@@ -134,16 +134,14 @@ class KernelNodeStoreBranch implements N
                 // Nothing was written to this branch: return base state
                 head = null;  // Mark as merged
                 return base;
-            }
-            else {
+            } else {
                 MicroKernel kernel = store.getKernel();
                 String mergedRevision = kernel.merge(headRevision, null);
                 headRevision = null;
                 head = null;  // Mark as merged
                 return store.getRootState(mergedRevision);
             }
-        }
-        catch (MicroKernelException e) {
+        } catch (MicroKernelException e) {
             setRoot(oldRoot);
             throw new CommitFailedException(e);
         }
@@ -157,8 +155,7 @@ class KernelNodeStoreBranch implements N
             head = root;
             base = root;
             baseRevision = root.getRevision();
-        }
-        else {
+        } else {
             headRevision = store.getKernel().rebase(headRevision, root.getRevision());
             head = store.getRootState(headRevision);
             base = root;



Mime
View raw message