jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r518928 - /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java
Date Fri, 16 Mar 2007 10:31:02 GMT
Author: angela
Date: Fri Mar 16 03:31:00 2007
New Revision: 518928

URL: http://svn.apache.org/viewvc?view=rev&rev=518928
Log:
if accessing conflicting item fails with NoSuchItemStateException the conflict can be ignored.

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

Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java?view=diff&rev=518928&r1=518927&r2=518928
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java
(original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java
Fri Mar 16 03:31:00 2007
@@ -779,6 +779,8 @@
                         + safeGetJCRPath(parentState)
                         + ": colliding with same-named existing node.");
                 }
+            } catch (NoSuchItemStateException e) {
+                // ignore: conflicting doesn't exist any more
             } catch (ItemStateException e) {
                 // should not occur, since existence has been asserted before
                 throw new RepositoryException(e);



Mime
View raw message