svn commit: r596374 - in /lenya/trunk/src/modules-core: ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java

Author: rfrovarp
Date: Mon Nov 19 09:25:35 2007
New Revision: 596374

URL: http://svn.apache.org/viewvc?rev=596374&view=rev
Log:
Remove dead code

Modified:
    lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java
    lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java

Modified: lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java?rev=596374&r1=596373&r2=596374&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java (original)
+++ lenya/trunk/src/modules-core/ac/java/src/org/apache/lenya/ac/impl/DefaultAccessController.java Mon Nov 19 09:25:35 2007
@@ -71,7 +71,6 @@
 
     private static final String VALID_IP = "([0-9]{1,3}\\.){3}[0-9]{1,3}";
     private ServiceManager manager;
-    private ServiceSelector accreditableManagerSelector;
     private ServiceSelector authorizerSelector;
     private ServiceSelector policyManagerSelector;
     private AccreditableManager accreditableManager;
@@ -338,12 +337,8 @@
      */
     public void dispose() {
 
-        if (this.accreditableManagerSelector != null) {
-            if (this.accreditableManager != null) {
-                this.accreditableManager.removeItemManagerListener(this);
-                this.accreditableManagerSelector.release(this.accreditableManager);
-            }
-            getManager().release(this.accreditableManagerSelector);
+       if (this.accreditableManager != null) {
+            this.accreditableManager.removeItemManagerListener(this);
         }
 
         if (this.policyManagerSelector != null) {

Modified: lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java?rev=596374&r1=596373&r2=596374&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java (original)
+++ lenya/trunk/src/modules-core/administration/java/src/org/apache/lenya/cms/ac/usecases/AccessControl.java Mon Nov 19 09:25:35 2007
@@ -55,8 +55,6 @@
 
     protected static final String AC_AREA = "acArea";
 
-    private Item[] items = null;
-
     protected static final String ADD = "add";
 
     protected static final String DELETE = "delete";
@@ -230,13 +228,6 @@
     }
 
     /**
-     * @return Item the item
-     */
-    public Item[] getItems() {
-        return this.items;
-    }
-
-    /**
      * Returns if one of the ancestors of this URL is SSL protected.
      * 
      * @return A boolean value.
@@ -441,4 +432,4 @@
         return url;
     }
 
-}
\ No newline at end of file
+}