[jboss-svn-commits] JBoss Common SVN: r4231 - jboss-logmanager/trunk/src/main/java/org/jboss/logmanager.

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

Author: david.lloyd at jboss.com
Date: 2010-04-06 21:27:30 -0400 (Tue, 06 Apr 2010)
New Revision: 4231

Modified:
   jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/DefaultConfigurationLocator.java
Log:
Fix prob where logging.properties can only be foudn on the TCCL

Modified: jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/DefaultConfigurationLocator.java
===================================================================
--- jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/DefaultConfigurationLocator.java	2010-04-06 11:59:26 UTC (rev 4230)
+++ jboss-logmanager/trunk/src/main/java/org/jboss/logmanager/DefaultConfigurationLocator.java	2010-04-07 01:27:30 UTC (rev 4231)
@@ -42,7 +42,8 @@
         }
         final ClassLoader tccl = Thread.currentThread().getContextClassLoader();
         if (tccl != null) try {
-            return tccl.getResourceAsStream("logging.properties");
+            final InputStream stream = tccl.getResourceAsStream("logging.properties");
+            if (stream != null) return stream;
         } catch (Exception e) {
         }
         return getClass().getResourceAsStream("logging.properties");