You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2008/09/16 18:40:02 UTC
svn commit: r695972 - in /jackrabbit/branches/1.4/jackrabbit-core: ./
src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java
Author: jukka
Date: Tue Sep 16 09:40:01 2008
New Revision: 695972
URL: http://svn.apache.org/viewvc?rev=695972&view=rev
Log:
1.4: Merged revision 691181 (JCR-1728)
Modified:
jackrabbit/branches/1.4/jackrabbit-core/ (props changed)
jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java
Propchange: jackrabbit/branches/1.4/jackrabbit-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 16 09:40:01 2008
@@ -1 +1 @@
-/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,668147,672125,679389,680135,681031,681287,682409,686688,691550,694164
+/jackrabbit/trunk/jackrabbit-core:653417,654078,654514,655917,656240,656655,656664,658583,668147,672125,679389,680135,681031,681287,682409,686688,691181,691550,694164
Modified: jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java?rev=695972&r1=695971&r2=695972&view=diff
==============================================================================
--- jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java (original)
+++ jackrabbit/branches/1.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java Tue Sep 16 09:40:01 2008
@@ -180,28 +180,24 @@
Set mixins = oldParent.getMixinTypeNames();
Path newPath = getPath(n.getNodeId(), hmgr);
Path oldPath = getZombiePath(n.getNodeId(), hmgr);
- if (!oldPath.equals(newPath)) {
- events.add(EventState.childNodeRemoved(oldParentId,
- getParent(oldPath),
- n.getNodeId(),
- oldPath.getNameElement(),
- oldParentNodeType.getQName(),
- mixins,
- session));
-
- NodeState newParent = (NodeState) changes.get(newParentId);
- NodeTypeImpl newParentNodeType = getNodeType(newParent, session);
- mixins = newParent.getMixinTypeNames();
- events.add(EventState.childNodeAdded(newParentId,
- getParent(newPath),
- n.getNodeId(),
- newPath.getNameElement(),
- newParentNodeType.getQName(),
- mixins,
- session));
- } else {
- log.error("Unable to calculate old path of moved node");
- }
+ events.add(EventState.childNodeRemoved(oldParentId,
+ getParent(oldPath),
+ n.getNodeId(),
+ oldPath.getNameElement(),
+ oldParentNodeType.getQName(),
+ mixins,
+ session));
+
+ NodeState newParent = (NodeState) changes.get(newParentId);
+ NodeTypeImpl newParentNodeType = getNodeType(newParent, session);
+ mixins = newParent.getMixinTypeNames();
+ events.add(EventState.childNodeAdded(newParentId,
+ getParent(newPath),
+ n.getNodeId(),
+ newPath.getNameElement(),
+ newParentNodeType.getQName(),
+ mixins,
+ session));
} else {
// a moved node always has a modified parent node
NodeState parent = null;