Index: src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
===================================================================
--- src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java	(revision 798806)
+++ src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java	(working copy)
@@ -313,6 +313,9 @@
      * {@inheritDoc}
      */
     public void dispose() {
+        // remove hierarchy manager as listener to avoid
+        // unnecessary work during stateMgr.dispose()
+        removeListener(hierMgr);
         // discard all transient changes
         disposeAllTransientItemStates();
         // dispose our (i.e. 'local') state manager