infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-12 07:58:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

7038843: IIOP serialization fails with NullPointerException when serializing Throwable

Browse Source 
Reviewed-by: dholmes, mchung
This commit is contained in:
Joe Darcy 2011-04-28 17:51:25 -07:00
parent f202396944
commit faa5e45f7a
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
jdk/src/share/classes/java/lang/Throwable.java
View File

@ -848,10 +848,9 @@ public class Throwable implements Serializable {
throw new NullPointerException("stackTrace[" + i + "]");
}
if (this.stackTrace == null) // Immutable stack
return;
synchronized (this) {
if (this.stackTrace == null) // Immutable stack
return;
this.stackTrace = defensiveCopy;
}
}
@ -958,18 +957,15 @@ public class Throwable implements Serializable {
// trace field is a valid value indicating the stack trace
// should not be set.
getOurStackTrace();
ObjectOutputStream.PutField fields = s.putFields();
fields.put("detailMessage", detailMessage);
fields.put("cause", cause);
// Serialize a null stacktrace using the stack trace sentinel.
if (stackTrace == null)
fields.put("stackTrace", SentinelHolder.STACK_TRACE_SENTINEL);
else
fields.put("stackTrace", stackTrace);
fields.put("suppressedExceptions", suppressedExceptions);
s.writeFields();
StackTraceElement[] oldStackTrace = stackTrace;
try {
if (stackTrace == null)
stackTrace = SentinelHolder.STACK_TRACE_SENTINEL;
s.defaultWriteObject();
} finally {
stackTrace = oldStackTrace;
}
}
/**