[jboss-cvs] JBossAS SVN: r100158 - in trunk: server/src/etc/deploy and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jaikiran
Date: 2010-01-30 04:59:25 -0500 (Sat, 30 Jan 2010)
New Revision: 100158

Modified:
   trunk/main/src/main/java/org/jboss/Main.java
   trunk/server/src/etc/deploy/legacy-conf-service.xml
Log:
JBAS-7588 The java.rmi.server.RMIClassLoaderSpi system property will now be set in Main.java so that it's available early enough for services depending on this. Removed the MBean in legacy-conf-service.xml which was setting this property (a bit too late)

Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java	2010-01-30 04:03:43 UTC (rev 100157)
+++ trunk/main/src/main/java/org/jboss/Main.java	2010-01-30 09:59:25 UTC (rev 100158)
@@ -189,6 +189,28 @@
             System.setProperty("log4j.defaultInitOverride", "true");
          }
       }
+      
+      // Set the RmiClassLoaderSpi to JBoss specific one
+      // see https://jira.jboss.org/jira/browse/JBAS-7588?focusedCommentId=12509300#action_12509300
+      String rmiClassLoaderSpi = System.getProperty("java.rmi.server.RMIClassLoaderSpi");
+      // if already set, then don't override it
+      if (rmiClassLoaderSpi == null)
+      {
+         String jbossRMIClassLoader = "org.jboss.system.JBossRMIClassLoader";
+         // Is the class available?
+         try
+         {
+            Thread.currentThread().getContextClassLoader().loadClass(jbossRMIClassLoader);
+            // class was available, so set the property
+            System.setProperty("java.rmi.server.RMIClassLoaderSpi", jbossRMIClassLoader);
+         }
+         catch (Throwable ignore)
+         {
+            // class isn't available, or there was some problem
+            // loading that class, so don't set the system property 
+         }
+         
+      }
 
       // Get JBOSS_HOME appropriately  
       final String homeUrl = props.get(JBossASServerConfig.PROP_KEY_JBOSSAS_HOME_URL);

Modified: trunk/server/src/etc/deploy/legacy-conf-service.xml
===================================================================
--- trunk/server/src/etc/deploy/legacy-conf-service.xml	2010-01-30 04:03:43 UTC (rev 100157)
+++ trunk/server/src/etc/deploy/legacy-conf-service.xml	2010-01-30 09:59:25 UTC (rev 100158)
@@ -37,14 +37,6 @@
         -->
     </mbean>
     
-    <!-- ==================================================================== -->
-    <!-- JBoss RMI Classloader - only install when available                  -->
-    <!-- ==================================================================== -->
-    <mbean code="org.jboss.util.property.jmx.SystemPropertyClassValue"
-        name="jboss.rmi:type=RMIClassLoader">
-        <attribute name="Property">java.rmi.server.RMIClassLoaderSpi</attribute>
-        <attribute name="ClassName">org.jboss.system.JBossRMIClassLoader</attribute>
-    </mbean>
     
     <!-- ==================================================================== -->
     <!-- Class Loading                                                        -->