Author: mduerig
Date: Wed Jun 26 08:31:44 2013
New Revision: 1496827
URL: http://svn.apache.org/r1496827
Log:
OAK-880: ChangeProcessor causes IllegalArgumentException when path filter ends
with a slash
oops
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/RecursingNodeStateDiff.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecurableNodeStateDiff.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecureNodeStateDiff.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/PostCommitHook.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/SecureNodeStateDiffTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java?rev=1496827&r1=1496826&r2=1496827&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/ChangeProcessor.java
Wed Jun 26 08:31:44 2013
@@ -230,7 +230,7 @@ class ChangeProcessor implements Runnabl
}
public EventGeneratingNodeStateDiff(ChangeSet changes, String path) {
- // michid parent nodes should be the root here
+ // FIXME parent nodes should be the root here
this(changes, path, new ArrayList<Iterator<Event>>(PURGE_LIMIT),
null, null, null, "");
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventImpl.java?rev=1496827&r1=1496826&r2=1496827&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/EventImpl.java
Wed Jun 26 08:31:44 2013
@@ -26,6 +26,9 @@ import javax.jcr.RepositoryException;
import org.apache.jackrabbit.api.observation.JackrabbitEvent;
+/**
+ * TODO document
+ */
public class EventImpl implements JackrabbitEvent {
private final int type;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/RecursingNodeStateDiff.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/RecursingNodeStateDiff.java?rev=1496827&r1=1496826&r2=1496827&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/RecursingNodeStateDiff.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/RecursingNodeStateDiff.java
Wed Jun 26 08:31:44 2013
@@ -31,8 +31,7 @@ import org.apache.jackrabbit.oak.spi.sta
* should <em>not</em> recurse into child nodes but rather only be concerned
about whether to continue
* diffing or not. The {@link #createChildDiff(String, NodeState, NodeState)}
will be called instead
* for diffing child nodes.
- * michid unify with NodeStateDiff
- * michid move
+ * TODO unify with NodeStateDiff
*/
public class RecursingNodeStateDiff extends DefaultNodeStateDiff {
public static final RecursingNodeStateDiff EMPTY = new
RecursingNodeStateDiff();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecurableNodeStateDiff.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecurableNodeStateDiff.java?rev=1496827&r1=1496826&r2=1496827&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecurableNodeStateDiff.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecurableNodeStateDiff.java
Wed Jun 26 08:31:44 2013
@@ -28,8 +28,6 @@ import org.apache.jackrabbit.oak.spi.sta
* Base class for {@code NodeStateDiff} implementations that can be secured.
* That is its call back methods are only called when its receiver has
sufficient
* rights to access respective items.
- * michid doc
- * michid move
*/
public abstract class SecurableNodeStateDiff implements NodeStateDiff {
private final SecurableNodeStateDiff parent;
@@ -110,7 +108,7 @@ public abstract class SecurableNodeState
@Override
public boolean childNodeChanged(final String name, final NodeState before,
final NodeState after) {
- // michid temporary solution to skip look ahead on hidden child nodes
+ // FIXME temporary solution to skip look ahead on hidden child nodes
if (NodeStateUtils.isHidden(name)) {
return true;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecureNodeStateDiff.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecureNodeStateDiff.java?rev=1496827&r1=1496826&r2=1496827&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecureNodeStateDiff.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/observation/SecureNodeStateDiff.java
Wed Jun 26 08:31:44 2013
@@ -23,10 +23,6 @@ import org.apache.jackrabbit.oak.api.Pro
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
-/**
- * michid document
- * michid move
- */
public class SecureNodeStateDiff extends SecurableNodeStateDiff {
private SecureNodeStateDiff(RecursingNodeStateDiff diff) {
super(diff);
@@ -49,25 +45,25 @@ public class SecureNodeStateDiff extends
@Override
protected boolean canRead(PropertyState before, PropertyState after) {
- // michid implement canRead
+ // TODO implement canRead
return true;
}
@Override
protected boolean canRead(String name, NodeState before, NodeState after) {
- // michid implement canRead
+ // TODO implement canRead
return true;
}
@Override
protected NodeState secureBefore(String name, NodeState nodeState) {
- // michid implement secureBefore
+ // TODO implement secureBefore
return nodeState;
}
@Override
protected NodeState secureAfter(String name, NodeState nodeState) {
- // michid implement secureAfter
+ // TODO implement secureAfter
return nodeState;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/PostCommitHook.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/PostCommitHook.java?rev=1496827&r1=1496826&r2=1496827&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/PostCommitHook.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/PostCommitHook.java
Wed Jun 26 08:31:44 2013
@@ -24,7 +24,7 @@ import javax.annotation.Nonnull;
import org.apache.jackrabbit.oak.spi.state.NodeState;
/**
- * michid unify with either Observer or CommitHook
+ * TODO unify with either Observer or CommitHook
*/
public interface PostCommitHook {
PostCommitHook EMPTY = new PostCommitHook() {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/SecureNodeStateDiffTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/SecureNodeStateDiffTest.java?rev=1496827&r1=1496826&r2=1496827&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/SecureNodeStateDiffTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/SecureNodeStateDiffTest.java
Wed Jun 26 08:31:44 2013
@@ -31,9 +31,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.Before;
import org.junit.Test;
-/**
- * michid move
- */
public class SecureNodeStateDiffTest {
private NodeState base;
