Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java =================================================================== --- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java (revision 629174) +++ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java (working copy) @@ -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);