summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2006-06-27 18:26:52 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2006-06-27 18:26:52 +0000
commitba1ff5f89cd04fe5d132d77cc7d2c200d43088bc (patch)
tree9977404b4f1f819ace5f24c7751f14d4230aafa5
parent548cebac82f8b26e6ae57e1537fbf5c31026cec9 (diff)
downloadclasspath-ba1ff5f89cd04fe5d132d77cc7d2c200d43088bc.tar.gz
2006-06-27 Andrew John Hughes <gnu_andrew@member.fsf.org>generics-merge-20060627
* java/lang/management/ThreadMXBean.java: (getThreadInfo(long[])): Corrected return type. (getThreadInfo(long[], int)): Likewise.
-rw-r--r--ChangeLog6
-rw-r--r--java/lang/management/ThreadMXBean.java4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6654d5caf..0f5fb4b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-27 Andrew John Hughes <gnu_andrew@member.fsf.org>
+
+ * java/lang/management/ThreadMXBean.java:
+ (getThreadInfo(long[])): Corrected return type.
+ (getThreadInfo(long[], int)): Likewise.
+
2006-06-27 Mark Wielaard <mark@klomp.org>
* java/awt/datatransfer/Clipboard.java (addFlavorListener): Do
diff --git a/java/lang/management/ThreadMXBean.java b/java/lang/management/ThreadMXBean.java
index 4e40e7fd3..2926548ad 100644
--- a/java/lang/management/ThreadMXBean.java
+++ b/java/lang/management/ThreadMXBean.java
@@ -282,7 +282,7 @@ public interface ThreadMXBean
* @throws SecurityException if a security manager exists and
* denies ManagementPermission("monitor").
*/
- ThreadInfo getThreadInfo(long[] ids);
+ ThreadInfo[] getThreadInfo(long[] ids);
/**
* Returns information on the specified thread with
@@ -336,7 +336,7 @@ public interface ThreadMXBean
* @throws SecurityException if a security manager exists and
* denies ManagementPermission("monitor").
*/
- ThreadInfo getThreadInfo(long[] ids, int maxDepth);
+ ThreadInfo[] getThreadInfo(long[] ids, int maxDepth);
/**
* <p>