directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r190338 - in /directory/apacheds/branches/direve-158/core/src/main: aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj java/org/apache/ldap/server/RootNexus.java
Date Mon, 13 Jun 2005 03:32:09 GMT
Author: trustin
Date: Sun Jun 12 20:32:08 2005
New Revision: 190338

URL: http://svn.apache.org/viewcvs?rev=190338&view=rev
Log:
* Fixed: compilation error in AspectJ
* Removed: singleton check in RootNexus

Modified:
    directory/apacheds/branches/direve-158/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj
    directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/RootNexus.java

Modified: directory/apacheds/branches/direve-158/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj?rev=190338&r1=190337&r2=190338&view=diff
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj
(original)
+++ directory/apacheds/branches/direve-158/core/src/main/aspects/org/apache/ldap/server/jndi/ProviderNexusAspect.aj
Sun Jun 12 20:32:08 2005
@@ -38,10 +38,10 @@
     
     /** 
      * Adds a static ThreadLocal for a Stack of LdapContexts representing nested
-     * backend nexus calls made by the JndiProvider's contexts within the same 
+     * backend nexus calls made by the DefaultContextFactoryContext's contexts within the
same 
      * thread of execution.
      */
-    private static ThreadLocal JndiProvider.s_contextStacks = new ThreadLocal();
+    private static ThreadLocal DefaultContextFactoryContext.s_contextStacks = new ThreadLocal();
     
     
     // ------------------------------------------------------------------------
@@ -55,7 +55,7 @@
      * 
      * @param context the caller or the current context for the nexus call
      */
-    private static void JndiProvider.push( LdapContext context )
+    private static void DefaultContextFactoryContext.push( LdapContext context )
     {
         Stack stack = ( Stack ) s_contextStacks.get();
         
@@ -75,7 +75,7 @@
      * 
      * @return the last LdapContext or caller
      */
-    private static LdapContext JndiProvider.pop()
+    private static LdapContext DefaultContextFactoryContext.pop()
     {
         Stack stack = ( Stack ) s_contextStacks.get();
         
@@ -93,7 +93,7 @@
      * 
      * @return the current LdapContext or caller
      */
-    static LdapContext JndiProvider.peek()
+    static LdapContext DefaultContextFactoryContext.peek()
     {
         Stack stack = ( Stack ) s_contextStacks.get();
         
@@ -118,7 +118,7 @@
      */    
     private static Stack getContextStack()
     {
-        Stack stack = ( Stack ) JndiProvider.s_contextStacks.get();
+        Stack stack = ( Stack ) DefaultContextFactoryContext.s_contextStacks.get();
         
         if ( stack == null )
         {
@@ -192,7 +192,7 @@
     before( Context caller ):
         jndiNexusCalls( caller )
         {
-    		JndiProvider.push( ( LdapContext ) caller );
+    		DefaultContextFactoryContext.push( ( LdapContext ) caller );
             //System.out.println( "\npushed " + caller + " for join point "
             //    + thisJoinPoint );
         }
@@ -201,7 +201,7 @@
     after( Context caller ):
         jndiNexusCalls( caller ) 
         {
-            LdapContext head = JndiProvider.pop();
+            LdapContext head = DefaultContextFactoryContext.pop();
             //System.out.println( "\npopped " + caller + " for join point "
             //    + thisJoinPoint );
         }

Modified: directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/RootNexus.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/RootNexus.java?rev=190338&r1=190337&r2=190338&view=diff
==============================================================================
--- directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/RootNexus.java
(original)
+++ directory/apacheds/branches/direve-158/core/src/main/java/org/apache/ldap/server/RootNexus.java
Sun Jun 12 20:32:08 2005
@@ -57,9 +57,6 @@
     /** the namingContexts DSE operational attribute */
     private static final String NAMINGCTXS_ATTR = "namingContexts";
 
-    /** Handle on the singleton instance of this class within the entire JVM. */
-    private static RootNexus s_singleton = null;
-    
     /** the closed state of this partition */
     private boolean closed = false;
 
@@ -83,13 +80,6 @@
      */
     public RootNexus( SystemPartition system, Attributes rootDSE )
     {
-        System.out.println( "new RootNexus()" );
-        if ( null != s_singleton )
-        {
-            throw new IllegalStateException();
-        }
-        
-        s_singleton = this;
         this.system = system;
 
         // setup that root DSE
@@ -544,8 +534,6 @@
                 error.addThrowable( e );
             }
         }
-
-        s_singleton = null;
 
         closed = true;
 



Mime
View raw message