From 35d51709830ba357880822156027d94c58b6a633 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 4 Dec 2006 21:38:46 +0000 Subject: 2006-12-04 Robert Lougher * java/lang/management/ThreadInfo.java (ThreadInfo): Check whether given a null lock and lockOwner. (getLockName): Switch condition. (getLockOwnerId): Likewise. (getLockOwnerName): Likewise. --- ChangeLog | 8 ++++++++ java/lang/management/ThreadInfo.java | 16 +++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1fa2d8e01..f0e5952fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-12-04 Robert Lougher + + * java/lang/management/ThreadInfo.java (ThreadInfo): Check + whether given a null lock and lockOwner. + (getLockName): Switch condition. + (getLockOwnerId): Likewise. + (getLockOwnerName): Likewise. + 2006-12-03 Mark Wielaard * javax/swing/JEditorPane.java (PageLoader.in): Made a PageStream. diff --git a/java/lang/management/ThreadInfo.java b/java/lang/management/ThreadInfo.java index 4bf35a4cb..f3131715b 100644 --- a/java/lang/management/ThreadInfo.java +++ b/java/lang/management/ThreadInfo.java @@ -200,10 +200,12 @@ public class ThreadInfo long waitedTime, boolean isInNative, boolean isSuspended, StackTraceElement[] trace) { - this(thread.getId(), thread.getName(), thread.getState(), blockedCount, - blockedTime, lock.getClass().getName() + "@" + - Integer.toHexString(System.identityHashCode(lock)), lockOwner.getId(), - lockOwner.getName(), waitedCount, waitedTime, isInNative, isSuspended, + this(thread.getId(), thread.getName(), thread.getState(), blockedCount, blockedTime, + lock == null ? null : lock.getClass().getName() + "@" + + Integer.toHexString(System.identityHashCode(lock)), + lockOwner == null ? -1 : lockOwner.getId(), + lockOwner == null ? null : lockOwner.getName(), + waitedCount, waitedTime, isInNative, isSuspended, trace); } @@ -484,7 +486,7 @@ public class ThreadInfo */ public String getLockName() { - if (threadState.equals("BLOCKED")) + if (!threadState.equals("BLOCKED")) return null; return lockName; } @@ -502,7 +504,7 @@ public class ThreadInfo */ public long getLockOwnerId() { - if (threadState.equals("BLOCKED")) + if (!threadState.equals("BLOCKED")) return -1; return lockOwnerId; } @@ -520,7 +522,7 @@ public class ThreadInfo */ public String getLockOwnerName() { - if (threadState.equals("BLOCKED")) + if (!threadState.equals("BLOCKED")) return null; return lockOwnerName; } -- cgit v1.2.1