Index: jackrabbit-core/src/test/java/org/apache/jackrabbit/LostFromCacheIssueTest.java
===================================================================
*** jackrabbit-core/src/test/java/org/apache/jackrabbit/LostFromCacheIssueTest.java	(revision 0)
--- jackrabbit-core/src/test/java/org/apache/jackrabbit/LostFromCacheIssueTest.java	(revision 0)
***************
*** 0 ****
--- 1,116 ----
+ package org.apache.jackrabbit;
+ 
+ import java.io.File;
+ import java.io.InputStream;
+ import java.util.LinkedList;
+ import java.util.List;
+ import java.util.concurrent.BrokenBarrierException;
+ import java.util.concurrent.CyclicBarrier;
+ 
+ import javax.jcr.NamespaceRegistry;
+ import javax.jcr.Node;
+ import javax.jcr.Property;
+ import javax.jcr.PropertyIterator;
+ import javax.jcr.Repository;
+ import javax.jcr.RepositoryException;
+ import javax.jcr.Session;
+ import javax.jcr.SimpleCredentials;
+ import javax.jcr.Workspace;
+ import javax.jcr.nodetype.NodeTypeManager;
+ 
+ import org.apache.jackrabbit.core.RepositoryImpl;
+ import org.apache.jackrabbit.core.SessionImpl;
+ import org.apache.jackrabbit.core.nodetype.NodeTypeDef;
+ import org.apache.jackrabbit.core.nodetype.NodeTypeManagerImpl;
+ import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
+ 
+ import junit.framework.TestCase;
+ 
+ public class LostFromCacheIssueTest extends TestCase {
+     public RepositoryImpl repository = null;
+     public Session session = null;
+     public Property mixinTypes;
+ 
+     static private void delete(File path) {
+         if(path.exists()) {
+             if(path.isDirectory()) {
+                 File[] files = path.listFiles();
+                 for(int i=0; i<files.length; i++)
+                     delete(files[i]);
+             }
+             path.delete();
+         }
+     }
+ 
+     static private void clear() {
+         String[] files = new String[] { ".lock", "repository", "version", "workspaces" };
+         for(int i=0; i<files.length; i++) {
+             File file = new File(files[i]);
+             delete(file);
+         }
+     }
+ 
+     public void setUp() throws Exception {
+         org.apache.jackrabbit.core.config.RepositoryConfig repoConfig = null;
+         InputStream config = getClass().getResourceAsStream("jackrabbit.xml");
+         String path = ".";
+ 
+         clear();
+ 
+         repoConfig = org.apache.jackrabbit.core.config.RepositoryConfig.create(config, path);
+         repository = org.apache.jackrabbit.core.RepositoryImpl.create(repoConfig);
+         Session session = repository.login(new SimpleCredentials("admin", "admin".toCharArray()));
+ 
+         System.err.println("Registering namespace and node types...");
+         Workspace workspace = session.getWorkspace();
+         NamespaceRegistry namespaceRegistry = workspace.getNamespaceRegistry();
+         NodeTypeManager ntmgr = workspace.getNodeTypeManager();
+         NodeTypeRegistry nodetypeRegistry = ((NodeTypeManagerImpl)ntmgr).getNodeTypeRegistry();
+         namespaceRegistry.registerNamespace("test", "http://www.onehippo.org/test/1.0");
+         NodeTypeDef nodeTypeDefinition = new NodeTypeDef();
+         nodeTypeDefinition.setName(((SessionImpl)session).getQName("test:mixin"));
+ 
+         nodeTypeDefinition.setMixin(true);
+         nodetypeRegistry.registerNodeType(nodeTypeDefinition);
+         nodeTypeDefinition = new NodeTypeDef();
+         nodeTypeDefinition.setName(((SessionImpl)session).getQName("test:mxn"));
+ 
+         nodeTypeDefinition.setMixin(true);
+         nodetypeRegistry.registerNodeType(nodeTypeDefinition);
+ 
+         /*System.err.println("Initializing tree...");
+         Node node = session.getRootNode();
+         node = node.addNode("test", "nt:unstructured");
+         buildTree(node, 2, 2, 10, 96, 0);
+         session.save();*/
+         session.getRootNode().addNode("test").addNode("node");
+         session.save();
+ 
+         session.logout();
+         this.session = repository.login(new SimpleCredentials("admin", "admin".toCharArray()));
+     }
+ 
+     public void tearDown() throws Exception {
+         if (session != null) {
+             session.logout();
+         }
+         if (repository != null) {
+             repository.shutdown();
+         }
+     }
+ 
+     public void testIssue() throws Exception {
+         String path = "/test/node";
+         Node node = session.getRootNode().getNode(path.substring(1));
+         node.addMixin("test:mxn");
+         mixinTypes = node.getProperty("jcr:mixinTypes");
+         session.save();
+         node.addMixin("test:mixin");
+         session.save();
+         node.removeMixin("test:mxn");
+         node.removeMixin("test:mixin");
+         session.save();
+         node.addMixin("test:mixin");
+         session.save();
+     }
+ }

Property changes on: jackrabbit-core/src/test/java/org/apache/jackrabbit/LostFromCacheIssueTest.java
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Index: jackrabbit-core/src/test/resources/org/apache/jackrabbit/jackrabbit.xml
===================================================================
*** jackrabbit-core/src/test/resources/org/apache/jackrabbit/jackrabbit.xml	(revision 0)
--- jackrabbit-core/src/test/resources/org/apache/jackrabbit/jackrabbit.xml	(revision 0)
***************
*** 0 ****
--- 1,167 ----
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+   Copyright 2007 Hippo
+ 
+   Licensed under the Apache License, Version 2.0 (the  "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS"
+   BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+ <!DOCTYPE Repository PUBLIC "-//The Apache Software Foundation//DTD Jackrabbit 1.5//EN"
+     "http://jackrabbit.apache.org/dtd/repository-1.5.dtd">
+     <Repository>
+       <!--
+         virtual file system where the repository stores global state
+         (e.g. registered namespaces, custom node types, etc.)
+       -->
+       <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+         <param name="path" value="${rep.home}/repository"/>
+       </FileSystem>
+ 
+       <!--
+         security configuration
+       -->
+       <Security appName="Jackrabbit">
+         <AccessManager class="org.apache.jackrabbit.core.security.SimpleAccessManager"/>
+         <LoginModule class="org.apache.jackrabbit.core.security.SimpleLoginModule">
+           <param name="anonymousId" value="anonymous"/>
+         </LoginModule>
+       </Security>
+ 
+ 
+       <!--
+         location of workspaces root directory and name of default workspace
+       -->
+       <Workspaces rootPath="${rep.home}/workspaces" defaultWorkspace="default"/>
+ 
+       <!--
+         workspace configuration template:
+         used to create the initial workspace if there's no workspace yet
+       -->
+       <Workspace name="${wsp.name}">
+ 
+         <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+           <param name="path" value="${wsp.home}"/>
+         </FileSystem>
+ 
+       <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager">
+         <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
+         <param name="schemaObjectPrefix" value="${wsp.name}_"/>
+       </PersistenceManager>
+ 
+         <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+           <!--
+             Search index and the file system it uses.
+             class: FQN of class implementing the QueryHandler interface
+ 
+             If required by the QueryHandler implementation, one may configure
+             a FileSystem that the handler may use.
+ 
+             Supported parameters for lucene search index:
+             - path: location of the index. This parameter is mandatory!
+             - useCompoundFile: advises lucene to use compound files for the index files
+             - minMergeDocs: minimum number of nodes in an index until segments are merged
+             - volatileIdleTime: idle time in seconds until the volatile index is
+             moved to persistent index even though minMergeDocs is not reached.
+             - maxMergeDocs: maximum number of nodes in segments that will be merged
+             - mergeFactor: determines how often segment indices are merged
+             - maxFieldLength: the number of words that are fulltext indexed at most per property.
+             - bufferSize: maximum number of documents that are held in a pending
+             queue until added to the index
+             - cacheSize: size of the document number cache. This cache maps
+             uuids to lucene document numbers
+             - forceConsistencyCheck: runs a consistency check on every startup. If
+             false, a consistency check is only performed when the search index
+             detects a prior forced shutdown. This parameter only has an effect
+             if 'enableConsistencyCheck' is set to 'true'.
+             - enableConsistencyCheck: if set to 'true' a consistency check is
+             performed depending on the parameter 'forceConsistencyCheck'. If
+             set to 'false' no consistency check is performed on startup, even
+             if a redo log had been applied.
+             - autoRepair: errors detected by a consistency check are automatically
+             repaired. If false, errors are only written to the log.
+             - analyzer: class name of a lucene analyzer to use for fulltext indexing of text.
+             - queryClass: class name that implements the javax.jcr.query.Query interface.
+             this class must extend the class: org.apache.jackrabbit.core.query.AbstractQueryImpl
+             - respectDocumentOrder: If true and the query does not contain an 'order by' clause,
+             result nodes will be in document order. For better performance when queries return
+             a lot of nodes set to 'false'.
+             - resultFetchSize: The number of results the query handler should
+             initially fetch when a query is executed.
+             Default value: Integer.MAX_VALUE (-> all)
+             - extractorPoolSize: defines the maximum number of background threads that are
+             used to extract text from binary properties. If set to zero (default) no
+             background threads are allocated and text extractors run in the current thread.
+             - extractorTimeout: a text extractor is executed using a background thread if it
+             doesn't finish within this timeout defined in milliseconds. This parameter has
+             no effect if extractorPoolSize is zero.
+             - extractorBackLogSize: the size of the extractor pool back log. If all threads in
+             the pool are busy, incomming work is put into a wait queue. If the wait queue
+             reaches the back log size incomming extractor work will not be queued anymore
+             but will be executed with the current thread.
+             - synonymProviderClass: the name of a class that implements
+             org.apache.jackrabbit.core.query.lucene.SynonymProvider. The
+             default value is null (-> not set).
+ 
+             Note: all parameters (except path) in this SearchIndex config are default
+             values and can be omitted.
+           -->
+           <param name="path" value="${wsp.home}/index"/>
+           <param name="useCompoundFile" value="true"/>
+           <param name="minMergeDocs" value="1000"/>
+           <param name="volatileIdleTime" value="10"/>
+           <param name="maxMergeDocs" value="1000000000"/>
+           <param name="mergeFactor" value="5"/>
+           <param name="maxFieldLength" value="10000"/>
+           <param name="bufferSize" value="1000"/>
+           <param name="cacheSize" value="1000"/>
+           <param name="forceConsistencyCheck" value="true"/>
+           <param name="enableConsistencyCheck" value="true"/>
+           <param name="autoRepair" value="true"/>
+           <param name="analyzer" value="org.apache.lucene.analysis.standard.StandardAnalyzer"/>
+           <param name="queryClass" value="org.apache.jackrabbit.core.query.QueryImpl"/>
+           <param name="respectDocumentOrder" value="false"/>
+           <param name="resultFetchSize" value="2147483647"/>
+           <param name="extractorPoolSize" value="0"/>
+           <param name="extractorTimeout" value="100"/>
+           <param name="extractorBackLogSize" value="100"/>
+           <param name="textFilterClasses" value="org.apache.jackrabbit.extractor.PlainTextExtractor,org.apache.jackrabbit.extractor.MsWordTextExtractor,org.apache.jackrabbit.extractor.MsExcelTextExtractor,org.apache.jackrabbit.extractor.MsPowerPointTextExtractor,org.apache.jackrabbit.extractor.PdfTextExtractor,org.apache.jackrabbit.extractor.OpenOfficeTextExtractor,org.apache.jackrabbit.extractor.RTFTextExtractor,org.apache.jackrabbit.extractor.HTMLTextExtractor,org.apache.jackrabbit.extractor.XMLTextExtractor"/>
+           <param name="excerptProviderClass" value="org.apache.jackrabbit.core.query.lucene.DefaultHTMLExcerpt"/>
+           <param name="supportHighlighting" value="true"/>
+         </SearchIndex>
+         <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking"/>
+       </Workspace>
+ 
+       <Versioning rootPath="${rep.home}/version">
+         <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+           <param name="path" value="${rep.home}/version"/>
+         </FileSystem>
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.bundle.DerbyPersistenceManager">
+           <param name="url" value="jdbc:derby:${rep.home}/version/db;create=true"/>
+           <param name="schemaObjectPrefix" value="version_"/>
+         </PersistenceManager>
+         <ISMLocking class="org.apache.jackrabbit.core.state.FineGrainedISMLocking"/>
+       </Versioning>
+ 
+ 
+       <!--
+         Search index for content that is shared repository wide
+         (/jcr:system tree, contains mainly versions)
+ 
+         The same parameters are supported as in the search index configuration
+         inside the workspace definition element.
+ 
+         This element is optional. If omitted, the /jcr:system tree will not be
+         indexed and no results will be returned for that tree!
+       -->
+       <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+         <param name="path" value="${rep.home}/repository/index"/>
+       </SearchIndex>
+     </Repository>

Property changes on: jackrabbit-core/src/test/resources/org/apache/jackrabbit/jackrabbit.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java
===================================================================
*** jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java	(revision 923523)
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateReferenceCache.java	(working copy)
***************
*** 22,27 ****
--- 22,28 ----
  import org.slf4j.LoggerFactory;
  
  import java.io.PrintStream;
+ import java.util.Map;
  
  /**
   * <code>ItemStateReferenceCache</code> internally consists of 2 components:
***************
*** 133,138 ****
--- 134,148 ----
          refs.remove(id);
      }
  
+     public synchronized void purge(ItemId id) {
+         cache.purge(id);
+     }
+ 
+     public synchronized void purge() {
+         cache.purge();
+         System.gc();
+     }
+ 
      /**
       * {@inheritDoc}
       */
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
===================================================================
*** jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java	(revision 923523)
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java	(working copy)
***************
*** 647,652 ****
--- 647,653 ----
  
                      shared.modified(state.getOverlayedState());
                  }
+                 cache.purge();
                  for (Iterator iter = local.deletedStates(); iter.hasNext();) {
                      ItemState state = (ItemState) iter.next();
                      state.connect(getItemState(state.getId()));
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/MLRUItemStateCache.java
===================================================================
*** jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/MLRUItemStateCache.java	(revision 923523)
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/MLRUItemStateCache.java	(working copy)
***************
*** 174,179 ****
--- 174,187 ----
          }
      }
  
+     public void purge(ItemId id) {
+         evict(id);
+     }
+ 
+     public void purge() {
+         evictAll();
+     }
+ 
      /**
       * {@inheritDoc}
       */
Index: jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateCache.java
===================================================================
*** jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateCache.java	(revision 923523)
--- jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ItemStateCache.java	(working copy)
***************
*** 70,75 ****
--- 70,79 ----
       */
      void evict(ItemId id);
  
+     void purge(ItemId id);
+ 
+     void purge();
+ 
      /**
       * Clears all entries from this cache.
       */