jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r481248 - /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java
Date Fri, 01 Dec 2006 14:10:43 GMT
Author: mreutegg
Date: Fri Dec  1 06:10:42 2006
New Revision: 481248

URL: http://svn.apache.org/viewvc?view=rev&rev=481248
Log:
Unnecessary check

Modified:
    jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java?view=diff&rev=481248&r1=481247&r2=481248
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java
(original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java
Fri Dec  1 06:10:42 2006
@@ -259,7 +259,7 @@
         if (another == null) {
             return false;
         }
-        if (another == null || !another.isNode()) {
+        if (!another.isNode()) {
             throw new IllegalArgumentException("Attempt to merge node state with property
state.");
         }
         boolean modified = false;



Mime
View raw message