[jboss-cvs] JBossAS SVN: r80625 - trunk/main/src/main/org/jboss.

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

Author: david.lloyd at jboss.com
Date: 2008-11-06 21:21:31 -0500 (Thu, 06 Nov 2008)
New Revision: 80625

Modified:
   trunk/main/src/main/org/jboss/Main.java
Log:
Allow a user-defined logmanager by only forcing org.jboss.logging.jdk.JDKLogManager if no other log manager was defined.

Modified: trunk/main/src/main/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/org/jboss/Main.java	2008-11-06 23:31:09 UTC (rev 80624)
+++ trunk/main/src/main/org/jboss/Main.java	2008-11-07 02:21:31 UTC (rev 80625)
@@ -497,9 +497,12 @@
                else if( arg.equalsIgnoreCase("jdk") )
                {
                   logPlugin = "org.jboss.logging.JDK14LoggerPlugin";
-                  // Also override the jdk LogManager
-                  System.setProperty("java.util.logging.manager",
-                     "org.jboss.logging.jdk.JDKLogManager");
+                  String name = System.getProperty("java.util.logging.manager");
+                  if (name == null) {
+                     // Also override the jdk LogManager
+                     System.setProperty("java.util.logging.manager",
+                        "org.jboss.logging.jdk.JDKLogManager");
+                  }
                }
                System.setProperty("org.jboss.logging.Logger.pluginClass", logPlugin);
                break;