jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r608159 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java
Date Wed, 02 Jan 2008 17:47:09 GMT
Author: tripod
Date: Wed Jan  2 09:47:02 2008
New Revision: 608159

URL: http://svn.apache.org/viewvc?rev=608159&view=rev
Log:
JCR-1197 Node.restore() may throw InvalidItemStateException

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

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java?rev=608159&r1=608158&r2=608159&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java
Wed Jan  2 09:47:02 2008
@@ -394,7 +394,9 @@
             // just ensure that the newly created state is still cached. it can
             // happen during a restore operation that a state with the same id
             // is deleted and created (JCR-1197)
-            cache.cache(local);
+            if (!cache.isCached(created.getId())) {
+                cache.cache(local);
+            }
         }
         if (local != null) {
             dispatcher.notifyStateCreated(created);



Mime
View raw message