Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

o Changed type of "cause" instance field from Nestable to Throwable. 

Since implementation of Throwable is already required, this doesn't
change the interface, but does simplify the internals.

o Simplified code in getThrowableCount() method by removing extraneous
null check and extra reference.

o Implemented suggestion by Joachim.Sauer@tp-soft.com to use
ExceptionUtils where Nestable.getCause() was previously called.


git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@136972 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Daniel Rall 2002-08-21 07:22:47 +00:00
parent 13fecb8398
commit 10c9649135
1 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/java/org/apache/commons/lang/exception/NestableDelegate.java
View File

@ -67,7 +67,7 @@ import java.util.StringTokenizer;
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a> * @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:knielsen@apache.org">Kasper Nielsen</a> * @author <a href="mailto:knielsen@apache.org">Kasper Nielsen</a>
* @author <a href="mailto:steven@caswell.name">Steven Caswell</a> * @author <a href="mailto:steven@caswell.name">Steven Caswell</a>
* @version $Id: NestableDelegate.java,v 1.2 2002/07/26 20:30:10 stevencaswell Exp $ * @version $Id: NestableDelegate.java,v 1.3 2002/08/21 07:22:47 dlr Exp $
*/ */
public class NestableDelegate public class NestableDelegate
{ {
@ -79,10 +79,10 @@ public class NestableDelegate
+ "constructor must extend java.lang.Throwable"; + "constructor must extend java.lang.Throwable";
/** /**
* Holds the reference to the exception or error that caused * Holds the reference to the exception or error that caused this
* this exception to be thrown. * exception to be thrown.
*/ */
private Nestable cause = null; private Throwable cause = null;
/** /**
* Constructs a new <code>NestableDelegate</code> instance to manage the * Constructs a new <code>NestableDelegate</code> instance to manage the
@ -95,7 +95,7 @@ public class NestableDelegate
{ {
if (cause instanceof Throwable) if (cause instanceof Throwable)
{ {
this.cause = cause; this.cause = (Throwable) cause;
} }
else else
{ {
@ -148,7 +148,7 @@ public class NestableDelegate
msg.append(baseMsg); msg.append(baseMsg);
} }
Throwable nestedCause = cause.getCause(); Throwable nestedCause = ExceptionUtils.getCause(this.cause);
if (nestedCause != null) if (nestedCause != null)
{ {
String causeMsg = nestedCause.getMessage(); String causeMsg = nestedCause.getMessage();
@ -177,7 +177,7 @@ public class NestableDelegate
*/ */
String[] getMessages() // package String[] getMessages() // package
{ {
Throwable throwables[] = this.getThrowables(); Throwable[] throwables = this.getThrowables();
String[] msgs = new String[throwables.length]; String[] msgs = new String[throwables.length];
for(int i = 0; i < throwables.length; i++) for(int i = 0; i < throwables.length; i++)
{ {
@ -201,7 +201,7 @@ public class NestableDelegate
{ {
if(index == 0) if(index == 0)
{ {
return (Throwable) this.cause; return this.cause;
} }
Throwable[] throwables = this.getThrowables(); Throwable[] throwables = this.getThrowables();
return throwables[index]; return throwables[index];
@ -218,22 +218,11 @@ public class NestableDelegate
// Count the number of throwables // Count the number of throwables
int count = 1; int count = 1;
String msg = null; String msg = null;
if(this.cause.getCause() == null) Throwable t = ExceptionUtils.getCause(this.cause);
{ while (t != null)
return count;
}
Throwable t = this.cause.getCause();
while(t != null)
{ {
++count; ++count;
if(Nestable.class.isInstance(t)) t = ExceptionUtils.getCause(t);
{
t = ((Nestable) t).getCause();
}
else
{
t = null;
}
} }
return count; return count;
} }
@ -253,19 +242,12 @@ public class NestableDelegate
count = 0; count = 0;
if(cause != null) if(cause != null)
{ {
throwables[count++] = (Throwable) this.cause; throwables[count++] = this.cause;
Throwable t = this.cause.getCause(); Throwable t = ExceptionUtils.getCause(this.cause);
while(t != null) while(t != null)
{ {
throwables[count++] = t; throwables[count++] = t;
if(Nestable.class.isInstance(t)) t = ExceptionUtils.getCause(t);
{
t = ((Nestable) t).getCause();
}
else
{
t = null;
}
} }
} }
return throwables; return throwables;
@ -344,8 +326,8 @@ public class NestableDelegate
{ {
synchronized (out) synchronized (out)
{ {
String[] st = decompose((Throwable) cause); String[] st = decompose(this.cause);
Throwable nestedCause = cause.getCause(); Throwable nestedCause = ExceptionUtils.getCause(this.cause);
if (nestedCause != null) if (nestedCause != null)
{ {
if (nestedCause instanceof Nestable) if (nestedCause instanceof Nestable)