jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r497023 - /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java
Date Wed, 17 Jan 2007 14:00:26 GMT
Author: angela
Date: Wed Jan 17 06:00:25 2007
New Revision: 497023

URL: http://svn.apache.org/viewvc?view=rev&rev=497023
Log:
work in progress

- minor improvement


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

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java?view=diff&rev=497023&r1=497022&r2=497023
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java
(original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java
Wed Jan 17 06:00:25 2007
@@ -21,8 +21,8 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.ConstraintViolationException;
 
-import org.apache.jackrabbit.spi.QPropertyDefinition;
 import org.apache.jackrabbit.name.QName;
+import org.apache.jackrabbit.spi.QPropertyDefinition;
 import org.apache.jackrabbit.spi.PropertyId;
 import org.apache.jackrabbit.spi.ItemId;
 import org.apache.jackrabbit.spi.IdFactory;
@@ -191,7 +191,7 @@
      * @see ItemState#merge(ItemState, boolean)
      */
     boolean merge(ItemState another, boolean keepChanges) {
-        if (another == null) {
+        if (another == null || another == this) {
             return false;
         }
         if (another.isNode()) {
@@ -354,7 +354,7 @@
         checkIsSessionState();
         // make sure the arguements are consistent and do not violate the
         // given property definition.
-        validate(values, type, this.def);
+        validate(values, type, def);
         init(type, values);
 
         markModified();



Mime
View raw message