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 2010/03/25 14:29:22 UTC

svn commit: r927393 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java

Author: jukka
Date: Thu Mar 25 13:29:21 2010
New Revision: 927393

URL: http://svn.apache.org/viewvc?rev=927393&view=rev
Log:
JCR-2433: NPE when copying nodes with Workspace.copy()

Work around the potential NPE by rearranging the name equality test

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

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java?rev=927393&r1=927392&r2=927393&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java Thu Mar 25 13:29:21 2010
@@ -1775,7 +1775,7 @@ public class BatchedItemOperations exten
                 QPropertyDefinition def = ent.getApplicablePropertyDef(
                         srcChildState.getName(), srcChildState.getType(),
                         srcChildState.isMultiValued());
-                if (def.getDeclaringNodeType().equals(NameConstants.MIX_LOCKABLE)) {
+                if (NameConstants.MIX_LOCKABLE.equals(def.getDeclaringNodeType())) {
                     // skip properties defined by mix:lockable
                     continue;
                 }