You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by st...@apache.org on 2006/05/15 09:59:33 UTC
svn commit: r406577 - in
/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core:
SessionImpl.java lock/LockManagerImpl.java
state/db/JNDIDatabasePersistenceManager.java
Author: stefan
Date: Mon May 15 00:59:32 2006
New Revision: 406577
URL: http://svn.apache.org/viewcvs?rev=406577&view=rev
Log:
JCR-429: Session scoped lock not always removed on Session.logout()
Modified:
jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
URL: http://svn.apache.org/viewcvs/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/SessionImpl.java?rev=406577&r1=406576&r2=406577&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/SessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/SessionImpl.java Mon May 15 00:59:32 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/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewcvs/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java?rev=406577&r1=406576&r2=406577&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java Mon May 15 00:59:32 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);
}
Modified: jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java
URL: http://svn.apache.org/viewcvs/jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java?rev=406577&r1=406576&r2=406577&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/db/JNDIDatabasePersistenceManager.java Mon May 15 00:59:32 2006
@@ -68,7 +68,7 @@
*
* @return new database connection
* @throws NamingException if the given data source location does not exist
- * @throws Exception if a database access error occurs
+ * @throws SQLException if a database access error occurs
* @see DatabasePersistenceManager#getConnection()
*/
protected Connection getConnection() throws NamingException, SQLException {