You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2006/11/22 08:55:41 UTC

svn commit: r478068 - /jackrabbit/trunk/jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/transaction/TxLockManagerImpl.java

Author: angela
Date: Tue Nov 21 23:55:40 2006
New Revision: 478068

URL: http://svn.apache.org/viewvc?view=rev&rev=478068
Log:
- less info-logging
- add generated locktoken to DavSession not to the repository-session.

Modified:
    jackrabbit/trunk/jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/transaction/TxLockManagerImpl.java

Modified: jackrabbit/trunk/jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/transaction/TxLockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/transaction/TxLockManagerImpl.java?view=diff&rev=478068&r1=478067&r2=478068
==============================================================================
--- jackrabbit/trunk/jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/transaction/TxLockManagerImpl.java (original)
+++ jackrabbit/trunk/jcr-server/src/main/java/org/apache/jackrabbit/webdav/jcr/transaction/TxLockManagerImpl.java Tue Nov 21 23:55:40 2006
@@ -280,7 +280,7 @@
      */
     private ActiveLock getLock(String lockToken, Scope scope, DavResource resource) {
         if (!(resource instanceof TransactionResource)) {
-            log.info("TransactionResource expected");
+            log.warn("TransactionResource expected");
             return null;
         }
 
@@ -356,7 +356,7 @@
      */
     private static void removeExpired(Transaction tx, TransactionMap responsibleMap,
                                       TransactionResource resource) {
-        log.info("Removing expired transaction lock " + tx);
+        log.debug("Removing expired transaction lock " + tx);
         try {
             tx.rollback(resource);
             removeReferences(tx, responsibleMap, resource);
@@ -375,8 +375,8 @@
      */
     private static void addReferences(Transaction tx, TransactionMap responsibleMap,
                                       TransactionResource resource) throws DavException {
-        log.info("Adding transactionId '" + tx.getId() + "' as session lock token.");
-        getRepositorySession(resource).addLockToken(tx.getId());
+        log.debug("Adding transactionId '" + tx.getId() + "' as session lock token.");
+        resource.getSession().addLockToken(tx.getId());
 
         responsibleMap.put(tx.getId(), tx);
         resource.getSession().addReference(tx.getId());
@@ -391,7 +391,7 @@
      */
     private static void removeReferences(Transaction tx, TransactionMap responsibleMap,
                                          TransactionResource resource) {
-        log.info("Removing transactionId '" + tx.getId() + "' from session lock tokens.");
+        log.debug("Removing transactionId '" + tx.getId() + "' from session lock tokens.");
         resource.getSession().removeLockToken(tx.getId());
 
         responsibleMap.remove(tx.getId());