Author: jukka
Date: Fri May 26 02:44:46 2006
New Revision: 409614

URL: http://svn.apache.org/viewvc?rev=409614&view=rev
Log:
1.0: Merged revision 406577: JCR-429

Modified:
    jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
    jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java

Modified: jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/SessionImpl.java?rev=409614&r1=409613&r2=409614&view=diff
==============================================================================
--- jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/SessionImpl.java (original)
+++ jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/SessionImpl.java Fri May 26 02:44:46 2006
@@ -1164,6 +1164,10 @@
             return;
         }
 
+        // discard any pending changes first as those might
+        // interfere with subsequent operations
+        itemStateMgr.disposeAllTransientItemStates();
+
         // notify listeners that session is about to be closed
         notifyLoggingOut();
 

Modified: jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java?rev=409614&r1=409613&r2=409614&view=diff
==============================================================================
--- jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java (original)
+++ jackrabbit/branches/1.0/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java Fri May 26 02:44:46 2006
@@ -889,7 +889,7 @@
                         NodeImpl node = (NodeImpl) session.getItemManager().getItem(getId());
                         node.unlock();
                     } catch (RepositoryException e) {
-                        log.warn("Unable to unlock session-scoped lock on node '"
+                        log.warn("Unable to remove session-scoped lock on node '"
                                 + lockToken + "': " + e.getMessage());
                         log.debug("Root cause: ", e);
                     }