jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r1071562 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java
Date Thu, 17 Feb 2011 10:01:17 GMT
Author: stefan
Date: Thu Feb 17 10:01:17 2011
New Revision: 1071562

URL: http://svn.apache.org/viewvc?rev=1071562&view=rev
Log:
JCR-2891: VersionManagerImplRestore internalRestoreFrozen method has identity versus equals
bug

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java?rev=1071562&r1=1071561&r2=1071562&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImplRestore.java
Thu Feb 17 10:01:17 2011
@@ -554,7 +554,7 @@ abstract public class VersionManagerImpl
                 NodeId nodeId = vh.getVersionableId();
                 if (stateMgr.hasItemState(nodeId)) {
                     restoredChild = state.getNode(nodeId);
-                    if (restoredChild.getParentId() == state.getNodeId()) {
+                    if (restoredChild.getParentId().equals(state.getNodeId())) {
                         // if same parent, ignore
                     } else if (removeExisting) {
                         NodeStateEx parent = restoredChild.getNode(restoredChild.getParentId());



Mime
View raw message