geronimo-scm mailing list archives

Author: djencks
Date: Thu Oct 15 17:15:33 2009
New Revision: 825573

URL: http://svn.apache.org/viewvc?rev=825573&view=rev
Log:
it starts once, but marks all plugins as load=false

Modified:
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/ConfigurationActivator.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/ConfigurationActivator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/ConfigurationActivator.java?rev=825573&r1=825572&r2=825573&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/ConfigurationActivator.java
(original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/osgi/ConfigurationActivator.java
Thu Oct 15 17:15:33 2009
@@ -62,8 +62,10 @@
 
     public void stop(BundleContext bundleContext) throws Exception {
         ServiceReference kernelReference = bundleContext.getServiceReference(Kernel.class.getName());
-        Kernel kernel = (Kernel) bundleContext.getService(kernelReference);
-        ConfigurationManager manager = ConfigurationUtil.getConfigurationManager(kernel);
-        manager.unloadConfiguration(id);
+        if (kernelReference != null) {
+            Kernel kernel = (Kernel) bundleContext.getService(kernelReference);
+            ConfigurationManager manager = ConfigurationUtil.getConfigurationManager(kernel);
+            manager.unloadConfiguration(id);
+        }
     }
 }

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java?rev=825573&r1=825572&r2=825573&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java
(original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java
Thu Oct 15 17:15:33 2009
@@ -63,7 +63,7 @@
     }
 
     public void doStart() throws Exception {
-        System.setProperty("java.rmi.server.RMIClassLoaderSpi",RMIClassLoaderSpiImpl.class.getName());
+//        System.setProperty("java.rmi.server.RMIClassLoaderSpi",RMIClassLoaderSpiImpl.class.getName());
         if (System.getProperty("java.rmi.server.hostname") == null && host != null
&& !host.equals("0.0.0.0")) {
             System.setProperty("java.rmi.server.hostname", host);
         }