jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1456037 - in /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr: RepositoryImpl.java SessionContext.java delegate/NodeDelegate.java delegate/SessionDelegate.java
Date Wed, 13 Mar 2013 16:30:18 GMT
Author: mduerig
Date: Wed Mar 13 16:30:17 2013
New Revision: 1456037

URL: http://svn.apache.org/r1456037
Log:
OAK-672: Avoid JCR APIs calling other JCR APIs
- TODOs

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/delegate/NodeDelegate.java
    jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.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=1456037&r1=1456036&r2=1456037&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 Mar 13 16:30:17 2013
@@ -126,7 +126,7 @@ public class RepositoryImpl implements R
         try {
             ContentSession contentSession = contentRepository.login(credentials, workspaceName);
 
-            final SessionContext[] context = new SessionContext[1];
+            final SessionContext[] context = new SessionContext[1];  // FIXME hack[]
             SessionDelegate sessionDelegate = new SessionDelegate(contentSession) {
                 @Override
                 protected void refresh() {

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=1456037&r1=1456036&r2=1456037&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
Wed Mar 13 16:30:17 2013
@@ -38,12 +38,16 @@ import org.apache.jackrabbit.oak.spi.sec
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
+/**
+ * TODO doc
+ */
 public abstract class SessionContext implements NamePathMapper {
     private final RepositoryImpl repository;
     private final SessionDelegate delegate;
     private final NamePathMapper namePathMapper;
     private final ValueFactory valueFactory;
 
+    // FIXME lazy initialisation is not thread safe
     private AccessControlManager accessControlManager;
     private PrincipalManager principalManager;
     private UserManager userManager;

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java?rev=1456037&r1=1456036&r2=1456037&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
Wed Mar 13 16:30:17 2013
@@ -230,7 +230,7 @@ public class NodeDelegate extends ItemDe
 
     //------------------------------------------------------------< internal >---
 
-    @Nonnull
+    @Nonnull // FIXME this should be package private
     public Tree getTree() throws InvalidItemStateException {
         Tree tree = getLocation().getTree();
         if (tree == null) {

Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java?rev=1456037&r1=1456036&r2=1456037&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
Wed Mar 13 16:30:17 2013
@@ -131,7 +131,7 @@ public class SessionDelegate {
         }
     }
 
-    @Nonnull
+    @Nonnull  // FIXME this should be package private
     public Root getRoot() {
         return root;
     }



Mime
View raw message