### Eclipse Workspace Patch 1.0
#P jackrabbit-core
Index: src/test/java/org/apache/jackrabbit/core/deadlock/DeadlockTest.java
===================================================================
--- src/test/java/org/apache/jackrabbit/core/deadlock/DeadlockTest.java	(revision 0)
+++ src/test/java/org/apache/jackrabbit/core/deadlock/DeadlockTest.java	(working copy)
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.jackrabbit.core.deadlock;
+
+import javax.jcr.Node;
+import javax.jcr.Session;
+
+import org.apache.jackrabbit.core.state.DeadlockUtils;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+
+public class DeadlockTest extends AbstractJCRTest {
+    
+    static final String TEST_ROOT = "t" + System.currentTimeMillis() + "_";
+
+    private Session session;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        session = testRootNode.getSession();
+    }
+    
+    public void testConcurrent() throws Exception {
+        if (!DeadlockUtils.INSTRUMENTATION) {
+            System.out.println("Instrumentation is disabled, tests will not find a deadlock");
+            return;
+        }
+        if (DeadlockUtils.PATCH) {
+            System.out.println("Patch is enabled: this test should pass");
+        } else {
+            System.out.println("Patch is disabled: this test should fail");
+        }
+        for(int i=0; i < 1000; i++) {
+            System.out.println("i: " + i);
+            testConcurrent(i);
+        }
+    }
+    
+    private void testConcurrent(final int index) throws Exception {
+        int threadCount = 3;
+        init(session, index);
+        Thread[] threads = new Thread[threadCount];
+        DeadlockUtils.clearBuffer();
+        for(int i=0; i<threadCount; i++) {
+            Thread t = new Thread() {
+                @Override
+                public void run() {
+                    try {
+                        final Session s = getHelper().getReadWriteSession();
+                        final Node node = s.getRootNode().getNode(TEST_ROOT + index);
+                        oneOperation(s, node);
+                        s.logout();
+                    } catch (Exception e) {                
+                        // ignore
+                    }
+                }
+            };
+            char threadId = (char) ('a' + i);
+            t.setName("Thread " + threadId + " init");
+            threads[i] = t;
+        }
+        for(Thread t : threads) {
+            t.start();
+        }
+        for (Thread t : threads) {
+            t.join(2000);
+            if (t.isAlive()) {
+                System.out.println("Deadlock: thread could not be joined within 2 seconds");
+                System.out.println(DeadlockUtils.getLog());
+                System.out.println("stopping the process now (System.exit does not work)");
+                Runtime.getRuntime().halt(1);
+            }
+        }
+    }
+    
+    private static void init(Session s, int index) throws Exception {
+        s.refresh(false);
+        Node root = s.getRootNode();
+        if (root.hasNode(TEST_ROOT + index)) {
+            root.getNode(TEST_ROOT + index).remove();
+            s.save();
+        }
+        Node testRoot = root.addNode(TEST_ROOT + index, "nt:unstructured");
+        testRoot.setProperty("testRoot", true);
+        s.save();
+    }
+    
+    static void oneOperation(Session s, Node node) throws Exception {
+        // start logging now:
+        Thread thread = Thread.currentThread();
+        String name = thread.getName();
+        thread.setName(name.substring(0, name.length() - 5));
+        
+        DeadlockUtils.log("node.hasNode('test')");
+        if (node.hasNode("test")) {
+            DeadlockUtils.log("t = node.getNode('test')");
+            Node t = node.getNode("test");
+            DeadlockUtils.log("t.setProperty('test')");
+            t.setProperty("x", 1);
+            DeadlockUtils.log("s.save()");
+            s.save();
+        } else {
+            // can not reproduce with nt:base
+            // node.addNode("test", "nt:base");
+            DeadlockUtils.log("node.addNode('test')");
+            Node t = node.addNode("test", "nt:unstructured");
+            t.setProperty("test", true);
+            DeadlockUtils.log("s.save()");
+            s.save();
+        }
+        DeadlockUtils.log("-- done --");
+    }
+
+}
\ No newline at end of file
Index: src/main/java/org/apache/jackrabbit/core/state/NodeState.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/state/NodeState.java	(revision 1691398)
+++ src/main/java/org/apache/jackrabbit/core/state/NodeState.java	(working copy)
@@ -19,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
@@ -109,6 +110,36 @@
         this.parentId = parentId;
         this.nodeTypeName = nodeTypeName;
     }
+    
+    private String getNodeName() {
+        Iterator it = propertyNames.iterator();
+        while (it.hasNext()) {
+            Object o = it.next();
+            String s = o.toString();
+            if(s.endsWith("testRoot")) {
+                return "testRoot";
+            } else if (s.endsWith("test")) {
+                return "test";
+            }
+        }
+        return "unknown";
+    }
+    
+    boolean isTestNode() {
+        return getNodeName().equals("test");
+    }
+    
+    public String toString() {
+        StringBuilder buff = new StringBuilder();
+        buff.append(super.toString());
+        if (isTransient()) {
+            buff.append("-transient");
+        }
+        if (overlayedState != null) {
+            buff.append("-overlayed=(" + overlayedState + ")");
+        }
+        return buff.toString();
+    }
 
     //-------------------------------------------------------< public methods >
     /**
@@ -116,6 +147,20 @@
      */
     @Override
     public synchronized void copy(ItemState state, boolean syncModCount) {
+        if (DeadlockUtils.INSTRUMENTATION) {
+            try {
+                if (isTestNode()) {
+                    DeadlockUtils.log("        NodeState.copy (artificially slow)");
+                }
+                synchronized (NodeState.class) {
+                    while (Math.random() < 0.5) {
+                        Thread.sleep(1);
+                    }
+                }
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
         synchronized (state) {
             NodeState nodeState = (NodeState) state;
             id = nodeState.id;
Index: src/main/java/org/apache/jackrabbit/core/state/ItemState.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/state/ItemState.java	(revision 1691398)
+++ src/main/java/org/apache/jackrabbit/core/state/ItemState.java	(working copy)
@@ -146,11 +146,22 @@
      * Pull state information from overlayed state.
      */
     synchronized void pull() {
+        boolean doLog = this instanceof NodeState && ((NodeState) this).isTestNode();
+        if (doLog) {
+            DeadlockUtils.log("    NodeState " + this + " .pull() {");
+            DeadlockUtils.log(DeadlockUtils.getStackTrace());
+        }
+        try {
         ItemState state = overlayedState;
         if (state != null) {
             // sync modification count
             copy(state, true);
         }
+        } finally {
+            if (doLog) {
+                DeadlockUtils.log("    }");
+            }
+        }
     }
 
     /**
Index: src/main/java/org/apache/jackrabbit/core/state/DeadlockUtils.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/state/DeadlockUtils.java	(revision 0)
+++ src/main/java/org/apache/jackrabbit/core/state/DeadlockUtils.java	(working copy)
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.jackrabbit.core.state;
+
+public class DeadlockUtils {
+    
+    public static final boolean INSTRUMENTATION = true;
+    
+    public static final boolean PATCH = false;
+    
+    private static StringBuilder LOG_BUFFER = new StringBuilder();
+
+    public static boolean isTestThread() {
+        if (!INSTRUMENTATION) {
+            return false;
+        }
+        String threadName = Thread.currentThread().getName();
+        return threadName.startsWith("Thread ");
+    }
+    
+    public static  void log(String message) {
+        if (!INSTRUMENTATION) {
+            return;
+        }
+        if (!isTestThread()) {
+            return;
+        }
+        String threadName = Thread.currentThread().getName();
+        if (threadName.endsWith(" init")) {
+            return;
+        }
+        LOG_BUFFER.append(threadName).append(' ').append(message).append('\n');
+    }
+
+    public static String getStackTrace() {
+        StringBuilder buff = new StringBuilder();
+        for(StackTraceElement e : Thread.currentThread().getStackTrace()) {
+            buff.append("             ").append(e.toString()).append('\n');
+        }
+        return buff.toString();
+    }
+
+    public static void clearBuffer() {
+        LOG_BUFFER.setLength(0);
+    }
+
+    public static String getLog() {
+        return LOG_BUFFER.toString();
+    }
+
+}
Index: src/test/java/org/apache/jackrabbit/core/deadlock/repository.xml
===================================================================
--- src/test/java/org/apache/jackrabbit/core/deadlock/repository.xml	(revision 0)
+++ src/test/java/org/apache/jackrabbit/core/deadlock/repository.xml	(working copy)
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You 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 2.0//EN"
+          "http://jackrabbit.apache.org/dtd/repository-2.0.dtd">
+
+<!-- Example Repository Configuration File
+     Used by
+     - org.apache.jackrabbit.core.config.RepositoryConfigTest.java
+     -
+-->
+<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>
+
+    <!--
+        data store configuration
+    -->
+    <DataStore class="org.apache.jackrabbit.core.data.FileDataStore"/>
+
+    <!--
+        security configuration
+    -->
+    <Security appName="Jackrabbit">
+        <!--
+            security manager:
+            class: FQN of class implementing the JackrabbitSecurityManager interface
+        -->
+        <SecurityManager class="org.apache.jackrabbit.core.DefaultSecurityManager" workspaceName="security">
+            <!--
+            workspace access:
+            class: FQN of class implementing the WorkspaceAccessManager interface
+            -->
+            <!-- <WorkspaceAccessManager class="..."/> -->
+            <!-- <param name="config" value="${rep.home}/security.xml"/> -->
+        </SecurityManager>
+
+        <!--
+            access manager:
+            class: FQN of class implementing the AccessManager interface
+        -->
+        <AccessManager class="org.apache.jackrabbit.core.security.DefaultAccessManager">
+            <!-- <param name="config" value="${rep.home}/access.xml"/> -->
+        </AccessManager>
+
+        <LoginModule class="org.apache.jackrabbit.core.security.authentication.DefaultLoginModule">
+           <!-- 
+              anonymous user name ('anonymous' is the default value)
+            -->
+           <param name="anonymousId" value="anonymous"/>
+           <!--
+              administrator user id (default value if param is missing is 'admin')
+            -->
+           <param name="adminId" value="admin"/>
+        </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}">
+        <!--
+            virtual file system of the workspace:
+            class: FQN of class implementing the FileSystem interface
+        -->
+        <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+            <param name="path" value="${wsp.home}"/>
+        </FileSystem>
+        <!--
+            persistence manager of the workspace:
+            class: FQN of class implementing the PersistenceManager interface
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
+          <param name="url" value="jdbc:derby:${wsp.home}/db;create=true"/>
+          <param name="schemaObjectPrefix" value="${wsp.name}_"/>
+        </PersistenceManager>
+        -->
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemBundlePersistenceManager">
+        </PersistenceManager>
+        
+        <!--
+            Search index and the file system it uses.
+            class: FQN of class implementing the QueryHandler interface
+        <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+            <param name="path" value="${wsp.home}/index"/>
+            <param name="supportHighlighting" value="true"/>
+        </SearchIndex>
+        -->
+    </Workspace>
+
+    <!--
+        Configures the versioning
+    -->
+    <Versioning rootPath="${rep.home}/version">
+        <!--
+            Configures the filesystem to use for versioning for the respective
+            persistence manager
+        -->
+        <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
+            <param name="path" value="${rep.home}/version" />
+        </FileSystem>
+
+        <!--
+            Configures the persistence manager to be used for persisting version state.
+            Please note that the current versioning implementation is based on
+            a 'normal' persistence manager, but this could change in future
+            implementations.
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.pool.DerbyPersistenceManager">
+          <param name="url" value="jdbc:derby:${rep.home}/version/db;create=true"/>
+          <param name="schemaObjectPrefix" value="version_"/>
+        </PersistenceManager>
+        -->
+        
+        <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemBundlePersistenceManager">
+        </PersistenceManager>
+    </Versioning>
+
+    <!--
+        Search index for content that is shared repository wide
+        (/jcr:system tree, contains mainly versions)
+    -->
+    <!--
+    <SearchIndex class="org.apache.jackrabbit.core.query.lucene.SearchIndex">
+        <param name="path" value="${rep.home}/repository/index"/>
+        <param name="supportHighlighting" value="true"/>
+    </SearchIndex>
+
+
+        Run with a cluster journal
+    <Cluster id="node1">
+        <Journal class="org.apache.jackrabbit.core.journal.MemoryJournal"/>
+    </Cluster>
+    -->
+</Repository>
Index: src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java	(revision 1691398)
+++ src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java	(working copy)
@@ -803,7 +803,22 @@
                 visibleState = transientState;
             }
         }
-        dispatcher.notifyStateCreated(visibleState);
+        boolean notifyTransientSpace = true;
+        if (visibleState instanceof NodeState) {
+            // no need to push "node created" to transient space:
+            // either the transient already knows about this state, or it doesn't
+            // the problem is, this can lead to a deadlock
+            notifyTransientSpace = false; 
+            if (!DeadlockUtils.PATCH) {
+                // disable this patch
+                notifyTransientSpace = true;
+            }
+        } else {
+            notifyTransientSpace = true;
+        }
+        if (notifyTransientSpace) {
+            dispatcher.notifyStateCreated(visibleState);
+        }
     }
 
     /**
@@ -978,13 +993,22 @@
     public NodeState makePersistent(NodeState transientState)
             throws RepositoryException {
         NodeState localState = stateMgr.getOrCreateLocalState(transientState);
-
+        boolean doLog = localState.isTestNode();
+        if (doLog) {       
+            DeadlockUtils.log("    NodeState.makePersistent() {");
+        }
+        try {
         synchronized (localState) {
             // copy state from transient state:
             localState.copy(transientState, true);
             // make state persistent
             store(localState);
         }
+        } finally {
+            if (doLog) {                   
+                DeadlockUtils.log("    }");
+            }
+        }
 
         // disconnect the transient item state
         disconnectTransientItemState(transientState);