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 ju...@apache.org on 2013/04/15 10:44:12 UTC
svn commit: r1467899 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java
Author: jukka
Date: Mon Apr 15 08:44:11 2013
New Revision: 1467899
URL: http://svn.apache.org/r1467899
Log:
OAK-673: Unified hook processing
Oops, fix broken commit
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java?rev=1467899&r1=1467898&r2=1467899&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/EditorDiff.java Mon Apr 15 08:44:11 2013
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.spi.commit;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
+import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NODE;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
@@ -126,7 +126,7 @@ public class EditorDiff implements NodeS
if (exception == null) {
try {
Editor e = editor.childNodeAdded(name, after);
- exception = EditorHook.process(e, EMPTY_NODE, after);
+ exception = process(e, MISSING_NODE, after);
} catch (CommitFailedException e) {
exception = e;
}
@@ -139,7 +139,7 @@ public class EditorDiff implements NodeS
if (exception == null) {
try {
Editor e = editor.childNodeChanged(name, before, after);
- exception = EditorHook.process(e, before, after);
+ exception = process(e, before, after);
} catch (CommitFailedException e) {
exception = e;
}
@@ -151,7 +151,7 @@ public class EditorDiff implements NodeS
if (exception == null) {
try {
Editor e = editor.childNodeDeleted(name, before);
- exception = EditorHook.process(e, before, EMPTY_NODE);
+ exception = process(e, before, MISSING_NODE);
} catch (CommitFailedException e) {
exception = e;
}