svn commit: r1518137 - in /jackrabbit/oak/trunk: oak-doc/src/site/markdown/differences.md oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java

[md...@apache.org]

Author: mduerig
Date: Wed Aug 28 10:10:23 2013
New Revision: 1518137

URL: http://svn.apache.org/r1518137
Log:
OAK-960 Enable session refresh state coordination between multiple session in single thread
- Set the auto refresh interval for sessions to Long.MAX_VALUE

Modified:
    jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences.md
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java

Modified: jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences.md
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences.md?rev=1518137&r1=1518136&r2=1518137&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences.md (original)
+++ jackrabbit/oak/trunk/oak-doc/src/site/markdown/differences.md Wed Aug 28 10:10:23 2013
@@ -50,11 +50,10 @@ This change can cause subtle differences
 relying on one session seeing the other session's changes. Oak requires explicit calls to
 `Session.refresh()`in this case.
 
-> *Note*: To ease migration to Oak, sessions will currently automatically refresh after being
-> idle for more than one second. Sessions being idle for more than one minute will log a warning to
-> the log file. Furthermore sessions are automatically synchronised to reflect the same state across
-> accesses within a single thread. That is, an older session will see the changes done through a
-> newer session given both sessions are accessed from within the same thread.
+> *Note*: To ease migration to Oak, sessions being idle for more than one minute will log a warning
+> to the log file. Furthermore sessions are automatically synchronised to reflect the same state
+> across accesses within a single thread. That is, an older session will see the changes done
+> through a newer session given both sessions are accessed from within the same thread.
 >
 > Automatic session synchronisation is a transient feature and will most probably be removed in
 > future versions of Oak. See [OAK-803](https://issues.apache.org/jira/browse/OAK-803) for further

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java?rev=1518137&r1=1518136&r2=1518137&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java Wed Aug 28 10:10:23 2013
@@ -57,16 +57,17 @@ public class RepositoryImpl implements J
 
     /**
      * Name of the session attribute value determining the session refresh
-     * behaviour.
+     * interval in seconds.
      *
-     * @see SessionDelegate#SessionDelegate(ContentSession, RefreshManager, SecurityProvider)
+     * @see RefreshManager
      */
     public static final String REFRESH_INTERVAL = "oak.refresh-interval";
 
     /**
      * Default value for {@link #REFRESH_INTERVAL}.
      */
-    private static final long DEFAULT_REFRESH_INTERVAL = Long.getLong("default-refresh-interval", 1);
+    private static final long DEFAULT_REFRESH_INTERVAL = Long.getLong(
+            "default-refresh-interval", Long.MAX_VALUE);
 
     private final Descriptors descriptors = new Descriptors(new SimpleValueFactory());
     private final ContentRepository contentRepository;