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

Merge from ../branches/1.1.x. svn merge -c 657148 ../branches/1.1.x 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@666920 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Linskey 2008-06-11 23:59:44 +00:00
parent 12c0a094ee
commit 06ab9692d5
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openjpa-kernel/src/main/java/org/apache/openjpa/util/Exceptions.java
View File

@ -171,7 +171,9 @@ public class Exceptions {
if (i < nested.length) {
out.println("NestedThrowables:");
for (; i < nested.length; i++)
nested[i].printStackTrace(out);
// guard against a nasty null in the array
if (nested[i] != null)
nested[i].printStackTrace(out);
}
}
@ -188,7 +190,9 @@ public class Exceptions {
if (i < nested.length) {
out.println("NestedThrowables:");
for (; i < nested.length; i++)
nested[i].printStackTrace(out);
// guard against a nasty null in the array
if (nested[i] != null)
nested[i].printStackTrace(out);
}
}
@ -239,7 +243,10 @@ public class Exceptions {
if (isSerializable(nested[i]))
newNested[i] = nested[i];
else
newNested[i] = new Exception(nested[i].toString());
// guard against a nasty null in the array by using valueOf
// instead of toString to prevent throwing yet another
// exception
newNested[i] = new Exception(String.valueOf(nested[i]));
}
return newNested;
}