svn commit: r1508459 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr: RepositoryImpl.java SessionContext.java SessionImpl.java

[mduerig]

Author: mduerig
Date: Tue Jul 30 14:20:44 2013
New Revision: 1508459

URL: http://svn.apache.org/r1508459
Log:
OAK-803: Backwards compatibility of long-lived sessions
Preliminary support for JCR-3634: oops, wrong type of attributes map

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/RepositoryImpl.java
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java

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=1508459&r1=1508458&r2=1508459&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
 Tue Jul 30 14:20:44 2013
@@ -158,7 +158,7 @@ public class RepositoryImpl implements R
 
             ContentSession contentSession = 
contentRepository.login(credentials, workspaceName);
             SessionContext context = new SessionContext(this, whiteboard,
-                    singletonMap(REFRESH_INTERVAL, refreshInterval),
+                    Collections.<String, Object>singletonMap(REFRESH_INTERVAL, 
refreshInterval),
                     new SessionDelegate(contentSession, refreshInterval));
             return context.getSession();
         } catch (LoginException e) {

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java?rev=1508459&r1=1508458&r2=1508459&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionContext.java
 Tue Jul 30 14:20:44 2013
@@ -93,7 +93,7 @@ public class SessionContext implements N
 
     SessionContext(
             RepositoryImpl repository, Whiteboard whiteboard,
-            Map<String, Long> attributes, final SessionDelegate delegate) {
+            Map<String, Object> attributes, final SessionDelegate delegate) {
         this.repository = checkNotNull(repository);
         this.whiteboard = checkNotNull(whiteboard);
         this.delegate = checkNotNull(delegate);

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java?rev=1508459&r1=1508458&r2=1508459&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
 Tue Jul 30 14:20:44 2013
@@ -80,9 +80,9 @@ public class SessionImpl implements Jack
 
     private final SessionContext sessionContext;
     private final SessionDelegate sd;
-    private final Map<String, Long> attributes;
+    private final Map<String, Object> attributes;
 
-    SessionImpl(SessionContext sessionContext, Map<String, Long> attributes) {
+    SessionImpl(SessionContext sessionContext, Map<String, Object> attributes) 
{
         this.sessionContext = sessionContext;
         this.sd = sessionContext.getSessionDelegate();
         this.attributes = attributes;