FedoraEvent now always returns the node path for getPath(), not somet…

…imes a property's path
fcrepo · May 30, 2014 · b26aa74 · b26aa74
1 parent 5a4248c
commit b26aa74
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...pl/src/main/java/org/fcrepo/kernel/impl/observer/eventmappings/AllNodeEventsOneEvent.java b/...pl/src/main/java/org/fcrepo/kernel/impl/observer/eventmappings/AllNodeEventsOneEvent.java
@@ -20,6 +20,7 @@
 import static org.slf4j.LoggerFactory.getLogger;
 import static javax.jcr.observation.Event.PROPERTY_ADDED;
 import static javax.jcr.observation.Event.PROPERTY_CHANGED;
+import static javax.jcr.observation.Event.PROPERTY_REMOVED;
 
 import java.util.Iterator;
 
@@ -105,7 +106,8 @@ public void remove() {
 
             private void addProperty( final FedoraEvent fedoraEvent, final Event e ) {
                 try {
-                    if ( e.getType() == PROPERTY_ADDED || e.getType() == PROPERTY_CHANGED ) {
+                    if ( e.getType() == PROPERTY_ADDED || e.getType() == PROPERTY_CHANGED
+                            || e.getType() == PROPERTY_REMOVED ) {
                         fedoraEvent.addProperty( e.getPath().substring(e.getPath().lastIndexOf("/") + 1) );
                     }
                 } catch (final RepositoryException ex) {

diff --git a/fcrepo-kernel/src/main/java/org/fcrepo/kernel/observer/FedoraEvent.java b/fcrepo-kernel/src/main/java/org/fcrepo/kernel/observer/FedoraEvent.java
@@ -20,6 +20,9 @@
 import static com.google.common.base.Throwables.propagate;
 import static com.google.common.collect.Sets.union;
 import static java.util.Collections.singleton;
+import static javax.jcr.observation.Event.PROPERTY_ADDED;
+import static javax.jcr.observation.Event.PROPERTY_CHANGED;
+import static javax.jcr.observation.Event.PROPERTY_REMOVED;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -98,7 +101,11 @@ public FedoraEvent addProperty( final String property ) {
      * @return the path of the underlying JCR {@link Event}s
      */
     public String getPath() throws RepositoryException {
-        return e.getPath();
+        if ( e.getType() == PROPERTY_ADDED || e.getType() == PROPERTY_CHANGED || e.getType() == PROPERTY_REMOVED ) {
+            return e.getPath().substring(0, e.getPath().lastIndexOf("/"));
+        } else {
+            return e.getPath();
+        }
     }
 
     /**