From ae3657126b078d34836c5cfcd99d156f99181b30 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 4 Dec 2006 21:39:37 +0000 Subject: 2006-12-04 Robert Lougher * java/lang/management/ThreadInfo.java (ThreadInfo): Check whether given a null lock and lockOwner. --- ChangeLog | 5 +++++ java/lang/management/ThreadInfo.java | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa3939550..8e67f3865 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-04 Robert Lougher + + * java/lang/management/ThreadInfo.java (ThreadInfo): Check + whether given a null lock and lockOwner. + 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 44aff6f1f..428aca3fa 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); } -- cgit v1.2.1