You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2007/07/17 20:56:15 UTC

svn commit: r557026 - in /geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config: KernelConfigurationManager.java SimpleConfigurationManager.java

Author: dwoods
Date: Tue Jul 17 11:56:15 2007
New Revision: 557026

URL: http://svn.apache.org/viewvc?view=rev&rev=557026
Log:
GERONIMO-3269 configuration overrides to connectors are lost if they are stopped outside of a server shutdown

Modified:
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java?view=diff&rev=557026&r1=557025&r2=557026
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/KernelConfigurationManager.java Tue Jul 17 11:56:15 2007
@@ -246,9 +246,6 @@
     protected void unload(Configuration configuration) {
         Artifact configurationId = configuration.getId();
         unload(configurationId);
-        if (configurationList != null) {
-            configurationList.removeConfiguration( configurationId );
-        }
     }
 
     private void unload(Artifact configurationId) {
@@ -281,6 +278,12 @@
         }
     }
 
+    protected void uninstall(Artifact configurationId) {
+        if (configurationList != null) {
+            configurationList.removeConfiguration( configurationId );
+        }
+    }
+    
     public void doStart() {
         kernel.registerShutdownHook(shutdownHook);
     }

Modified: geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java?view=diff&rev=557026&r1=557025&r2=557026
==============================================================================
--- geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java (original)
+++ geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java Tue Jul 17 11:56:15 2007
@@ -1242,6 +1242,7 @@
             }
         }
 
+        uninstall(configurationId);
         List storeSnapshot = getStoreList();
         for (int i = 0; i < storeSnapshot.size(); i++) {
             ConfigurationStore store = (ConfigurationStore) storeSnapshot.get(i);
@@ -1252,6 +1253,10 @@
 
         removeConfigurationFromModel(configurationId);
         notifyWatchers(configurationId);
+    }
+
+    protected void uninstall(Artifact configurationId) {
+        //child class can override this method
     }
 
     private void notifyWatchers(Artifact id) {