You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by in...@apache.org on 2009/12/02 12:47:21 UTC

svn commit: r886121 - /synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java

Author: indika
Date: Wed Dec  2 11:47:18 2009
New Revision: 886121

URL: http://svn.apache.org/viewvc?rev=886121&view=rev
Log:
remove RMI registry created when shutdown JNDI datasources

Modified:
    synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java

Modified: synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java?rev=886121&r1=886120&r2=886121&view=diff
==============================================================================
--- synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java (original)
+++ synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/datasource/JNDIBasedDataSourceRepository.java Wed Dec  2 11:47:18 2009
@@ -46,6 +46,7 @@
     private static final Map<String, InitialContext> perDataSourceICMap
             = new HashMap<String, InitialContext>();
     private static final List<String> cachedNameList = new ArrayList<String>();
+    private static final List<Integer> cachedPorts = new ArrayList<Integer>();
 
     private boolean initialized = false;
 
@@ -277,6 +278,10 @@
         jndiProperties.clear();
         perDataSourceICMap.clear();
         cachedNameList.clear();
+        for (int port : cachedPorts) {
+            RMIRegistryController.getInstance().removeLocalRegistry(port);
+        }
+        cachedPorts.clear();
     }
 
     private InitialContext getCachedInitialContext(String name) {
@@ -481,6 +486,7 @@
 
             // Create a RMI local registry
             RMIRegistryController.getInstance().createLocalRegistry(port);
+            cachedPorts.add(port);
             providerUrl = "rmi://" + providerHost + ":" + port;
 
         }