svn commit: r1594020 - /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java

[ggregory]

Author: ggregory
Date: Mon May 12 16:18:37 2014
New Revision: 1594020

URL: http://svn.apache.org/r1594020
Log:
Rename ivar proxyCause to causeProxy. Working toward new XML and JSON 
Serialization and Deserialization.

Modified:
    
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java

Modified: 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java?rev=1594020&r1=1594019&r2=1594020&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
 Mon May 12 16:18:37 2014
@@ -46,7 +46,7 @@ public class ThrowableProxy implements S
 
     private static final Method ADD_SUPPRESSED;
 
-    private final ThrowableProxy proxyCause;
+    private final ThrowableProxy causeProxy;
 
     private final transient Throwable throwable;
 
@@ -98,7 +98,7 @@ public class ThrowableProxy implements S
         final Map<String, CacheEntry> map = new HashMap<String, CacheEntry>();
         final Stack<Class<?>> stack = getCurrentStack();
         callerPackageData = resolvePackageData(stack, map, null, 
throwable.getStackTrace());
-        this.proxyCause = throwable.getCause() == null ? null :
+        this.causeProxy = throwable.getCause() == null ? null :
             new ThrowableProxy(throwable, stack, map, throwable.getCause());
         setSuppressed(throwable);
     }
@@ -116,7 +116,7 @@ public class ThrowableProxy implements S
         this.throwable = cause;
         this.name = cause.getClass().getName();
         callerPackageData = resolvePackageData(stack, map, 
parent.getStackTrace(), cause.getStackTrace());
-        this.proxyCause = cause.getCause() == null ? null :
+        this.causeProxy = cause.getCause() == null ? null :
             new ThrowableProxy(parent, stack, map, cause.getCause());
         setSuppressed(cause);
     }
@@ -126,7 +126,7 @@ public class ThrowableProxy implements S
     }
 
     public ThrowableProxy getCause() {
-        return proxyCause;
+        return causeProxy;
     }
 
     /**
@@ -175,8 +175,8 @@ public class ThrowableProxy implements S
      */
     public String getRootCauseStackTrace(final List<String> packages) {
         final StringBuilder sb = new StringBuilder();
-        if (proxyCause != null) {
-            formatWrapper(sb, proxyCause);
+        if (causeProxy != null) {
+            formatWrapper(sb, causeProxy);
             sb.append("Wrapped by: ");
         }
         sb.append(toString());
@@ -204,7 +204,7 @@ public class ThrowableProxy implements S
     public void formatWrapper(final StringBuilder sb, final ThrowableProxy 
cause, final List<String> packages) {
         final Throwable caused = cause.getCause() != null ? 
cause.getCause().getThrowable() : null;
         if (caused != null) {
-            formatWrapper(sb, cause.proxyCause);
+            formatWrapper(sb, cause.causeProxy);
             sb.append("Wrapped by: ");
         }
         sb.append(cause).append(EOL);
@@ -233,8 +233,8 @@ public class ThrowableProxy implements S
         }
         sb.append(EOL);
         formatElements(sb, 0, throwable.getStackTrace(), callerPackageData, 
packages);
-        if (proxyCause != null) {
-            formatCause(sb, proxyCause, packages);
+        if (causeProxy != null) {
+            formatCause(sb, causeProxy, packages);
         }
         return sb.toString();
     }
@@ -261,7 +261,7 @@ public class ThrowableProxy implements S
         formatElements(sb, cause.commonElementCount, 
cause.getThrowable().getStackTrace(), cause.callerPackageData,
             packages);
         if (cause.getCause() != null) {
-            formatCause(sb, cause.proxyCause, packages);
+            formatCause(sb, cause.causeProxy, packages);
         }
     }