logging-log4j-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carn...@apache.org
Subject svn commit: r697432 - /logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedThrowableRenderer.java
Date Sat, 20 Sep 2008 23:10:48 GMT
Author: carnold
Date: Sat Sep 20 16:10:48 2008
New Revision: 697432

URL: http://svn.apache.org/viewvc?rev=697432&view=rev
Log:
Bug 45721: Avoid redetermining location and version for previously visited classes

Modified:
    logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedThrowableRenderer.java

Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedThrowableRenderer.java
URL: http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedThrowableRenderer.java?rev=697432&r1=697431&r2=697432&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedThrowableRenderer.java (original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/EnhancedThrowableRenderer.java Sat
Sep 20 16:10:48 2008
@@ -22,6 +22,8 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.security.CodeSource;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Enhanced implementation of ThrowableRenderer.  Uses Throwable.getStackTrace
@@ -64,8 +66,9 @@
                 Object[] elements = (Object[]) getStackTraceMethod.invoke(throwable, noArgs);
                 String[] lines = new String[elements.length + 1];
                 lines[0] = throwable.toString();
+                Map classMap = new HashMap();
                 for(int i = 0; i < elements.length; i++) {
-                    lines[i+1] = formatElement(elements[i]);
+                    lines[i+1] = formatElement(elements[i], classMap);
                 }
                 return lines;
             } catch(Exception ex) {
@@ -77,60 +80,68 @@
     /**
      * Format one element from stack trace.
      * @param element element, may not be null.
+     * @param classMap map of class name to location.
      * @return string representation of element.
      */
-    private String formatElement(final Object element) {
+    private String formatElement(final Object element, final Map classMap) {
         StringBuffer buf = new StringBuffer("\tat ");
         buf.append(element);
         try {
             String className = getClassNameMethod.invoke(element, (Object[]) null).toString();
-            Class cls = findClass(className);
-            buf.append('[');
-            try {
-                CodeSource source = cls.getProtectionDomain().getCodeSource();
-                if (source != null) {
-                   URL locationURL = source.getLocation();
-                   if (locationURL != null) {
-                       //
-                       //   if a file: URL
-                       //
-                       if ("file".equals(locationURL.getProtocol())) {
-                           String path = locationURL.getPath();
-                           if (path != null) {
-                               //
-                               //  find the last file separator character
-                               //
-                               int lastSlash = path.lastIndexOf('/');
-                               int lastBack = path.lastIndexOf(File.separatorChar);
-                               if (lastBack > lastSlash) {
-                                   lastSlash = lastBack;
-                               }
-                               //
-                               //  if no separator or ends with separator (a directory)
-                               //     then output the URL, otherwise just the file name.
-                               //
-                               if (lastSlash <= 0 || lastSlash == path.length() - 1) {
-                                   buf.append(locationURL);
-                               } else {
-                                   buf.append(path.substring(lastSlash + 1));
-                               }
-                           }
-                       } else {
-                           buf.append(locationURL);
-                       }
-                   }
+            Object classDetails = classMap.get(className);
+            if (classDetails != null) {
+                buf.append(classDetails);
+            } else {
+                Class cls = findClass(className);
+                int detailStart = buf.length();
+                buf.append('[');
+                try {
+                    CodeSource source = cls.getProtectionDomain().getCodeSource();
+                    if (source != null) {
+                        URL locationURL = source.getLocation();
+                        if (locationURL != null) {
+                            //
+                            //   if a file: URL
+                            //
+                            if ("file".equals(locationURL.getProtocol())) {
+                                String path = locationURL.getPath();
+                                if (path != null) {
+                                    //
+                                    //  find the last file separator character
+                                    //
+                                    int lastSlash = path.lastIndexOf('/');
+                                    int lastBack = path.lastIndexOf(File.separatorChar);
+                                    if (lastBack > lastSlash) {
+                                        lastSlash = lastBack;
+                                    }
+                                    //
+                                    //  if no separator or ends with separator (a directory)
+                                    //     then output the URL, otherwise just the file name.
+                                    //
+                                    if (lastSlash <= 0 || lastSlash == path.length() -
1) {
+                                        buf.append(locationURL);
+                                    } else {
+                                        buf.append(path.substring(lastSlash + 1));
+                                    }
+                                }
+                            } else {
+                                buf.append(locationURL);
+                            }
+                        }
+                    }
+                } catch(SecurityException ex) {
                 }
-            } catch(SecurityException ex) {
-            }
-            buf.append(':');
-            Package pkg = cls.getPackage();
-            if (pkg != null) {
-                String implVersion = pkg.getImplementationVersion();
-                if (implVersion != null) {
-                    buf.append(implVersion);
+                buf.append(':');
+                Package pkg = cls.getPackage();
+                if (pkg != null) {
+                    String implVersion = pkg.getImplementationVersion();
+                    if (implVersion != null) {
+                        buf.append(implVersion);
+                    }
                 }
+                buf.append(']');
+                classMap.put(className, buf.substring(detailStart));
             }
-            buf.append(']');
         } catch(Exception ex) {
         }
         return buf.toString();



---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org


Mime
View raw message