changeset 3414:cd13b2114f2e

Merge
author phh
date Sat, 22 Jan 2011 08:42:14 -0500
parents 64ef2f52d781 cc195c981ae2
children d1365fdfb3ea
files src/share/classes/sun/management/ThreadImpl.java
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/management/ThreadImpl.java	Fri Jan 21 07:29:59 2011 -0500
+++ b/src/share/classes/sun/management/ThreadImpl.java	Sat Jan 22 08:42:14 2011 -0500
@@ -251,7 +251,8 @@
         boolean verified = verifyThreadCpuTime(ids);
 
         int length = ids.length;
-        long[] times = java.util.Arrays.fill(new long[length], -1);
+        long[] times = new long[length];
+        java.util.Arrays.fill(times, -1);
 
         if (verified) {
             if (length == 1) {
@@ -285,7 +286,8 @@
         boolean verified = verifyThreadCpuTime(ids);
 
         int length = ids.length;
-        long[] times = java.util.Arrays.fill(new long[length], -1);
+        long[] times = new long[length];
+        java.util.Arrays.fill(times, -1);
 
         if (verified) {
             if (length == 1) {
@@ -340,7 +342,8 @@
     public long[] getThreadAllocatedBytes(long[] ids) {
         boolean verified = verifyThreadAllocatedMemory(ids);
 
-        long[] times = java.util.Arrays.fill(new long[length], -1);
+        long[] sizes = new long[ids.length];
+        java.util.Arrays.fill(sizes, -1);
 
         if (verified) {
             getThreadAllocatedMemory1(ids, sizes);
--- a/test/ProblemList.txt	Fri Jan 21 07:29:59 2011 -0500
+++ b/test/ProblemList.txt	Sat Jan 22 08:42:14 2011 -0500
@@ -439,6 +439,9 @@
 java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java generic-all
 java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java generic-all
 
+java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java         generic-all
+java/rmi/transport/dgcDeadLock/TestImpl_Stub.java                       generic-all
+
 # Address already in use, othervm mode, solaris
 java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java	generic-all
 java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java	generic-all