You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2011/09/15 17:42:32 UTC
svn commit: r1171144 -
/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/CommitBuilder.java
Author: stefan
Date: Thu Sep 15 15:42:32 2011
New Revision: 1171144
URL: http://svn.apache.org/viewvc?rev=1171144&view=rev
Log:
fixed missing break
Modified:
jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/CommitBuilder.java
Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/CommitBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/CommitBuilder.java?rev=1171144&r1=1171143&r2=1171144&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/CommitBuilder.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/store/CommitBuilder.java Thu Sep 15 15:42:32 2011
@@ -357,8 +357,9 @@ public class CommitBuilder {
} else {
// todo handle/merge colliding node additions
}
+ break;
}
- // TODO fall through?
+
case REMOVED_DIRTY_NODE_CONFLICT:
mergedNode.getProperties().remove(conflictName);
break;