stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7045138: OutOfMemoryError thrown without stack trace in jdk7-b142

Browse Source 
Reviewed-by: dholmes, mchung
This commit is contained in:
Joe Darcy 2011-05-18 16:49:20 -07:00
parent 41491be4d6
commit 250f88282b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -777,7 +777,8 @@ public class Throwable implements Serializable {
* @see java.lang.Throwable#printStackTrace() * @see java.lang.Throwable#printStackTrace()
*/ */
public synchronized Throwable fillInStackTrace() { public synchronized Throwable fillInStackTrace() {
if (stackTrace != null) { if (stackTrace != null ||
backtrace != null /* Out of protocol state */ ) {
fillInStackTrace(0); fillInStackTrace(0);
stackTrace = UNASSIGNED_STACK; stackTrace = UNASSIGNED_STACK;
} }
@ -817,7 +818,8 @@ public class Throwable implements Serializable {
private synchronized StackTraceElement[] getOurStackTrace() { private synchronized StackTraceElement[] getOurStackTrace() {
// Initialize stack trace field with information from // Initialize stack trace field with information from
// backtrace if this is the first call to this method // backtrace if this is the first call to this method
if (stackTrace == UNASSIGNED_STACK) { if (stackTrace == UNASSIGNED_STACK ||
(stackTrace == null && backtrace != null) /* Out of protocol state */) {
int depth = getStackTraceDepth(); int depth = getStackTraceDepth();
stackTrace = new StackTraceElement[depth]; stackTrace = new StackTraceElement[depth];
for (int i=0; i < depth; i++) for (int i=0; i < depth; i++)
@ -865,7 +867,8 @@ public class Throwable implements Serializable {
} }
synchronized (this) { synchronized (this) {
if (this.stackTrace == null) // Immutable stack if (this.stackTrace == null && // Immutable stack
backtrace == null) // Test for out of protocol state
return; return;
this.stackTrace = defensiveCopy; this.stackTrace = defensiveCopy;
} }