svn commit: r651192 - /jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java

[an...@apache.org]

Author: angela
Date: Thu Apr 24 01:13:38 2008
New Revision: 651192

URL: http://svn.apache.org/viewvc?rev=651192&view=rev
Log:
JCR-1104 : JSR 283 support (security work in progress)

don't pass attic-aware hierMgr to ac-context. internal retrieval of removed/invalidated 
items/itemdata should be handled otherwise (i.a. check for read-perm is redundant if
only internal clean up is performed).

Modified:
    jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java?rev=651192&r1=651191&r2=651192&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java Thu Apr 24 01:13:38 2008
@@ -295,7 +295,7 @@
         itemStateMgr = createSessionItemStateManager(wsp.getItemStateManager());
         hierMgr = itemStateMgr.getHierarchyMgr();
         itemMgr = createItemManager(itemStateMgr, hierMgr);
-        accessMgr = createAccessManager(subject, itemStateMgr.getAtticAwareHierarchyMgr());
+        accessMgr = createAccessManager(subject, itemStateMgr.getHierarchyMgr());
         versionMgr = createVersionManager(rep);
     }
 
@@ -350,20 +350,22 @@
     /**
      * Create the access manager.
      *
+     * @param subject
+     * @param hierarchyManager
      * @return access manager
      * @throws AccessDeniedException if the current subject is not granted access
      *                               to the current workspace
      * @throws RepositoryException   if the access manager cannot be instantiated
      */
     protected AccessManager createAccessManager(Subject subject,
-                                                HierarchyManager hierMgr)
+                                                HierarchyManager hierarchyManager)
             throws AccessDeniedException, RepositoryException {
         String wspName = getWorkspace().getName();
         AMContext ctx = new AMContext(new File(rep.getConfig().getHomeDir()),
                 rep.getFileSystem(),
                 this,
                 getSubject(),
-                getItemStateManager().getAtticAwareHierarchyMgr(),
+                hierarchyManager,
                 getNamePathResolver(),
                 wspName);
         return rep.getSecurityManager().getAccessManager(this, ctx);