[jboss-svn-commits] JBoss Common SVN: r4943 - common-core/trunk/src/main/java/org/jboss/util.

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

Author: dimitris at jboss.org
Date: 2013-06-06 16:29:36 -0400 (Thu, 06 Jun 2013)
New Revision: 4943

Modified:
   common-core/trunk/src/main/java/org/jboss/util/NestedThrowable.java
Log:
JBCOMMON-35 needs fixing for JDK6, too

Modified: common-core/trunk/src/main/java/org/jboss/util/NestedThrowable.java
===================================================================
--- common-core/trunk/src/main/java/org/jboss/util/NestedThrowable.java	2013-05-16 04:33:07 UTC (rev 4942)
+++ common-core/trunk/src/main/java/org/jboss/util/NestedThrowable.java	2013-06-06 20:29:36 UTC (rev 4943)
@@ -110,7 +110,9 @@
    final class Util 
    {
       // Can not be final due to init bug, see getLogger() for details
-      private static Logger log = Logger.getLogger(NestedThrowable.class);
+	  // This variable should not be accessed directly so the getLogger method
+	  // will be able to check it is not null.
+      private static Logger pvtLog = null;
 
       /**
        * Something is very broken with class nesting, which can sometimes
@@ -122,25 +124,30 @@
        */
       private static Logger getLogger()
       {
-         if (log == null)
-            log = Logger.getLogger(NestedThrowable.class);
+         if (pvtLog == null)
+        	 pvtLog = Logger.getLogger(NestedThrowable.class);
 
-         return log;
+         return pvtLog;
       }
       
+      /** A helper to get a boolean property. */
       protected static boolean getBoolean(String name, boolean defaultValue)
       {
          name = NestedThrowable.class.getName() + "." + name;
          String value = System.getProperty(name, String.valueOf(defaultValue));
 
          // HACK see getLogger() for details
-         log = getLogger();
+         Logger log = getLogger();
          
          log.debug(name + "=" + value);
 
          return new Boolean(value).booleanValue();
       }
 
+      /**
+       * Check and possibly warn if the nested exception type is the same
+       * as the parent type (duplicate nesting).
+       */
       public static void checkNested(final NestedThrowable parent,
                                      final Throwable child)
       {
@@ -155,7 +162,7 @@
          
          if (parentType.isAssignableFrom(childType)) {
             // HACK see getLogger() for details
-            log = getLogger();
+            Logger log = getLogger();
 
             log.warn("Duplicate throwable nesting of same base type: " +
                      parentType + " is assignable from: " + childType);