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 2008/02/26 16:45:14 UTC

svn commit: r631257 - /jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java

Author: jukka
Date: Tue Feb 26 07:45:13 2008
New Revision: 631257

URL: http://svn.apache.org/viewvc?rev=631257&view=rev
Log:
JCR-1399: Backport JCR-1197 to 1.3 branch
    - 1.3: Merged revision 608159 (JCR-1197)
    - Patch by Alexander Klimetschek

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

Modified: jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java?rev=631257&r1=631256&r2=631257&view=diff
==============================================================================
--- jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java (original)
+++ jackrabbit/branches/1.3/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java Tue Feb 26 07:45:13 2008
@@ -397,6 +397,12 @@
         } else {
             // local state was created
             local = created;
+            // 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)
+            if (!cache.isCached(created.getId())) {
+                cache.cache(local);
+            }
         }
         if (local != null) {
             dispatcher.notifyStateCreated(created);