You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2013/11/28 06:45:49 UTC

svn commit: r1546289 - in /jackrabbit/branches/2.6: ./ RELEASE-NOTES.txt jackrabbit-core/src/main/java/org/apache/jackrabbit/core/session/SessionState.java

Author: jukka
Date: Thu Nov 28 05:45:49 2013
New Revision: 1546289

URL: http://svn.apache.org/r1546289
Log:
2.6: Merged revision 1516281 (JCR-3654)

Modified:
    jackrabbit/branches/2.6/   (props changed)
    jackrabbit/branches/2.6/RELEASE-NOTES.txt
    jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/session/SessionState.java

Propchange: jackrabbit/branches/2.6/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1516281

Modified: jackrabbit/branches/2.6/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/RELEASE-NOTES.txt?rev=1546289&r1=1546288&r2=1546289&view=diff
==============================================================================
--- jackrabbit/branches/2.6/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/2.6/RELEASE-NOTES.txt Thu Nov 28 05:45:49 2013
@@ -23,8 +23,10 @@ Bug fixes
 
   [JCR-1880] Same name sibling: Jackrabbit behaves differently when ...
   [JCR-3364] Moving of nodes requires read access to all parent nodes ...
+  [JCR-3653] SessionState logs nano seconds but writes 'us'
   [JCR-3654] Error MembershipCache if a group node contains MV property
   [JCR-3682] Better Exception Handling in TransactionContext to handle ...
+  [JCR-3691] Search index consistency check logs unnecessary warnings ...
 
 Changes since Jackrabbit 2.6.3
 ------------------------------

Modified: jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/session/SessionState.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/session/SessionState.java?rev=1546289&r1=1546288&r2=1546289&view=diff
==============================================================================
--- jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/session/SessionState.java (original)
+++ jackrabbit/branches/2.6/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/session/SessionState.java Thu Nov 28 05:45:49 2013
@@ -226,7 +226,7 @@ public class SessionState {
                         readDuration.addAndGet(time);
                     }
 
-                    log.debug("Performed {} in {}us", operation, time);
+                    log.debug("Performed {} in {}ns", operation, time);
                 }
             } finally {
                 isWriteOperation = wasWriteOperation;