directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r158741 - in directory/apacheds/trunk: core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java plugin/maven.xml
Date Wed, 23 Mar 2005 06:47:11 GMT
Author: akarasulu
Date: Tue Mar 22 22:47:11 2005
New Revision: 158741

URL: http://svn.apache.org/viewcvs?view=rev&rev=158741
Log:
The shutdown command is not working because every time an InitialContext
is requested the JNDI instantiates a new InitialContextFactory.  So the 
MINA registries wind up being null.  To fix this I will make it static.  I
am not too happy about doing this but it should work and this JNDI 
ContextFactory is just for apps.  If in a container it should not be used.

Modified:
    directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
    directory/apacheds/trunk/plugin/maven.xml

Modified: directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java?view=diff&r1=158740&r2=158741
==============================================================================
--- directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
(original)
+++ directory/apacheds/trunk/core/src/main/java/org/apache/ldap/server/jndi/ServerContextFactory.java
Tue Mar 22 22:47:11 2005
@@ -58,9 +58,9 @@
     // Members
     // ------------------------------------------------------------------------
 
-    private Service minaService;
+    private static Service minaService;
 
-    private ServiceRegistry minaRegistry;
+    private static ServiceRegistry minaRegistry;
 
 
     /**
@@ -87,9 +87,9 @@
             {
                 this.provider.shutdown();
 
-                if ( this.minaRegistry != null )
+                if ( minaRegistry != null )
                 {
-                    this.minaRegistry.unbind( minaService );
+                    minaRegistry.unbind( minaService );
                 }
             }
             catch ( Throwable t )

Modified: directory/apacheds/trunk/plugin/maven.xml
URL: http://svn.apache.org/viewcvs/directory/apacheds/trunk/plugin/maven.xml?view=diff&r1=158740&r2=158741
==============================================================================
--- directory/apacheds/trunk/plugin/maven.xml (original)
+++ directory/apacheds/trunk/plugin/maven.xml Tue Mar 22 22:47:11 2005
@@ -12,4 +12,8 @@
   <preGoal name="eclipse">
     <attainGoal name="antlr:generate" />
   </preGoal>
+
+  <preGoal name="idea:module">
+    <attainGoal name="antlr:generate" />
+  </preGoal>
 </project>



Mime
View raw message