jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject svn commit: r1448535 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/LogWrapper.java
Date Thu, 21 Feb 2013 08:10:12 GMT
Author: thomasm
Date: Thu Feb 21 08:10:11 2013
New Revision: 1448535

URL: http://svn.apache.org/r1448535
Log:
OAK-536 Implement rebase for branches in Microkernel

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/LogWrapper.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/LogWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/LogWrapper.java?rev=1448535&r1=1448534&r2=1448535&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/LogWrapper.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/LogWrapper.java
Thu Feb 21 08:10:11 2013
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.plugin
 import java.io.InputStream;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import javax.annotation.Nonnull;
-
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.mk.json.JsopBuilder;
 import org.apache.jackrabbit.oak.plugins.index.old.mk.ExceptionFactory;
@@ -229,10 +227,17 @@ public class LogWrapper implements Micro
         }
     }
 
-    @Nonnull
     @Override
-    public String rebase(@Nonnull String branchRevisionId, String newBaseRevisionId) {
-        throw new UnsupportedOperationException();
+    public String rebase(String branchRevisionId, String newBaseRevisionId) {
+        try {
+            logMethod("rebase", branchRevisionId, newBaseRevisionId);
+            String result = mk.rebase(branchRevisionId, newBaseRevisionId);
+            logResult(result);
+            return result;
+        } catch (Exception e) {
+            logException(e);
+            throw convert(e);
+        }
     }
 
     private void logMethod(String methodName, Object... args) {



Mime
View raw message