June 2012 - core-libs-dev

Re: [PATCH] 7164256 : EnumMap.clone doesn't clear the entrySet field, keeping a reference to the original Map
by Remi Forax 06 Jun '12

06 Jun '12

Yes, looks good to me too. Cheers, Rémi ----- Reply message ----- From: "Chris Hegarty" <chris.hegarty(a)oracle.com> To: "Alan Bateman" <Alan.Bateman(a)oracle.com> Cc: <core-libs-dev(a)openjdk.java.net> Subject: [PATCH] 7164256 : EnumMap.clone doesn't clear the entrySet field, keeping a reference to the original Map Date: Wed, Jun 6, 2012 14:35 On 06/06/2012 13:28, Alan Bateman wrote: > > This looks good to me and I'm happy to sponsor this. Does anyone else > want to review this? The changes look fine to me too. -Chris. > > -Alan > > > On 29/05/2012 03:37, Diego Belfer wrote: >> : >> >> # HG changeset patch >> # User muralx >> # Date 1338257674 10800 >> # Node ID f61b94fd7aca738353177fcf3cc3972ddf36cf36 >> # Parent 9b8c96f96a0f9a5801b55530a387fefbe50482a3 >> PATCH 7164256 : EnumMap.clone does not clear the instance field entrySet >> >> diff --git a/src/share/classes/java/util/EnumMap.java >> b/src/share/classes/java/util/EnumMap.java >> --- a/src/share/classes/java/util/EnumMap.java >> +++ b/src/share/classes/java/util/EnumMap.java >> @@ -721,6 +721,7 @@ >> throw new AssertionError(); >> } >> result.vals = result.vals.clone(); >> + result.entrySet = null; >> return result; >> } >> >> diff --git a/test/java/util/EnumMap/ProperEntrySetOnClone.java >> b/test/java/util/EnumMap/ProperEntrySetOnClone.java >> new file mode 100644 >> --- /dev/null >> +++ b/test/java/util/EnumMap/ProperEntrySetOnClone.java >> @@ -0,0 +1,58 @@ >> +/* >> + * Copyright (c) 2012, Oracle and/or its affiliates. All rights >> reserved. >> + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. >> + * >> + * This code is free software; you can redistribute it and/or modify it >> + * under the terms of the GNU General Public License version 2 only, as >> + * published by the Free Software Foundation. >> + * >> + * This code is distributed in the hope that it will be useful, but >> WITHOUT >> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or >> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License >> + * version 2 for more details (a copy is included in the LICENSE file >> that >> + * accompanied this code). >> + * >> + * You should have received a copy of the GNU General Public License >> version >> + * 2 along with this work; if not, write to the Free Software >> Foundation, >> + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. >> + * >> + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA >> 94065 USA >> + * or visit www.oracle.com <http://www.oracle.com> if you need >> additional information or have any >> + * questions. >> + */ >> + >> +/* >> + * @test >> + * @bug 7164256 >> + * @summary EnumMap.entrySet() returns an entrySet referencing to the >> cloned instance >> + * @author Diego Belfer >> + */ >> + >> +import java.util.EnumMap; >> + >> +public class ProperEntrySetOnClone { >> + public enum Test { >> + ONE, TWO >> + } >> + >> + public static void main(String[] args) { >> + EnumMap<Test, String> map1 = new EnumMap<Test, String>(Test.class); >> + map1.put(Test.ONE, "1"); >> + map1.put(Test.TWO, "2"); >> + >> + // We need to force creation of the map1.entrySet >> + int size = map1.entrySet().size(); >> + if (size != 2) { >> + throw new RuntimeException( >> + "Invalid size in original map. Expected: 2 was: " + size); >> + } >> + >> + EnumMap<Test, String> map2 = map1.clone(); >> + map2.remove(Test.ONE); >> + size = map2.entrySet().size(); >> + if (size != 1) { >> + throw new RuntimeException( >> + "Invalid size in cloned instance. Expected: 1 was: " + size); >> + } >> + } >> +} >> >

2 1

hg: jdk8/tl/jdk: 7172826: (se) Selector based on the Solaris event port mechanism
by alan.bateman＠oracle.com 06 Jun '12

06 Jun '12

Changeset: 119c9a306a3d Author: alanb Date: 2012-06-06 17:59 +0100 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/119c9a306a3d 7172826: (se) Selector based on the Solaris event port mechanism Reviewed-by: coffeys, chegar ! make/java/nio/Makefile ! make/java/nio/mapfile-linux ! make/java/nio/mapfile-solaris ! src/share/classes/sun/nio/ch/IOUtil.java ! src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java ! src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java + src/solaris/classes/sun/nio/ch/EventPortSelectorImpl.java + src/solaris/classes/sun/nio/ch/EventPortSelectorProvider.java + src/solaris/classes/sun/nio/ch/EventPortWrapper.java ! src/solaris/classes/sun/nio/ch/SolarisEventPort.java ! src/solaris/native/sun/nio/ch/DevPollArrayWrapper.c ! src/solaris/native/sun/nio/ch/EPollArrayWrapper.c ! src/solaris/native/sun/nio/ch/IOUtil.c ! src/solaris/native/sun/nio/ch/SolarisEventPort.c ! test/java/nio/channels/Selector/lots_of_updates.sh ! test/java/nio/channels/SocketChannel/Open.sh ! test/sun/nio/ch/SelProvider.java

1 0

non-blocking channel Infinite loop in java.util.Scanner
by Rémi Forax 06 Jun '12

06 Jun '12

One of my student find a bug in the implementation of Scanner, that allows you to use a non blocking channel as input of a Scanner. The Scanner uses Channels.newReader() to create a Reader from a channel which itself create a StreamDecoder. In that case, StreamDecoder.impReader() goes into an infinite loop because impReader() calls readBytes() that does nothing if channel.read() returns zero. The javadoc of Channels.newReader() clearly states that it should throw a IllegalBlockingModeException but there is no code that checks that. I think a way to solve the problem is to insert a code that check the blocking state in Channels.newWriter(). if (ch instanceof SelectableChannel) { SelectableChannel sc = (SelectableChannel)ch; if (!sc.isBlocking()) throw new IllegalBlockingModeException(); } } and to document the exception in the constructor of Scanner that takes a channel. If someone provide me a bug id, it will provide a patch :) cheers, Rémi PS: The code below is a simple test to reproduce the infinite loop. ---------------------------------------------------- import java.io.IOException; import java.net.InetSocketAddress; import java.nio.ByteBuffer; import java.nio.channels.ServerSocketChannel; import java.nio.channels.SocketChannel; import java.util.Scanner; public class Main { public static void main(String[] args) throws IOException { ServerSocketChannel serverSocketChannel = ServerSocketChannel.open(); serverSocketChannel.bind(new InetSocketAddress(2332)); new Thread(new Runnable() { @Override public void run() { try { SocketChannel channel = SocketChannel.open(new InetSocketAddress("localhost", 2332)); do { channel.write(ByteBuffer.wrap(new byte[] {'A'})); Thread.sleep(1000); } while(true); } catch (IOException | InterruptedException e) { throw new AssertionError(e); } } }).start(); SocketChannel socketChannel = serverSocketChannel.accept(); socketChannel.configureBlocking(false); Scanner scanner = new Scanner(socketChannel); while(scanner.hasNextLine()) { System.out.println(scanner.nextLine()); } } }

2 3

Code Review Request: 7173645: (props) System.getProperty("os.name") should return "Windows Server 2012" for Windows Server 2012
by Kurchi Hazra 06 Jun '12

06 Jun '12

Hi, This is a minor change in java_props_md.c to return "Windows Server 2012" as the "os.name" when running on Windows Server 2012. Bug: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7173645 (To appear soon) Webrev: http://cr.openjdk.java.net/~khazra/7173645/webrev.00/ Thanks, Kurchi

4 3

hg: jdk8/tl/jdk: 7174351: test/sun/security/tools/keytool/standard.sh failed after new Hashtable
by weijun.wang＠oracle.com 06 Jun '12

06 Jun '12

Changeset: b6eb10d6932f Author: weijun Date: 2012-06-06 10:05 +0800 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/b6eb10d6932f 7174351: test/sun/security/tools/keytool/standard.sh failed after new Hashtable Reviewed-by: xuelei ! test/sun/security/tools/keytool/KeyToolTest.java

1 0

hg: jdk8/tl/hotspot: 23 new changesets
by lana.steuck＠oracle.com 06 Jun '12

06 Jun '12

Changeset: 03d61caacd1e Author: amurillo Date: 2012-05-18 14:57 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/03d61caacd1e 7170006: new hotspot build - hs24-b12 Reviewed-by: jcoomes ! make/hotspot_version Changeset: 0251d217257f Author: sla Date: 2012-05-08 20:28 +0200 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/0251d217257f 7162726: Wrong filter predicate of visible locals in SA JSJavaFrame Reviewed-by: sla, dcubed Contributed-by: Krystal Mok <rednaxelafx(a)gmail.com> ! agent/src/share/classes/sun/jvm/hotspot/utilities/soql/JSJavaFrame.java Changeset: 7f410b6ea66c Author: dholmes Date: 2012-05-09 00:28 -0400 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/7f410b6ea66c 7167406: (Zero) Fix for InvokeDynamic needed Reviewed-by: chrisphi, dholmes Contributed-by: Andrew Dinn <adinn(a)redhat.com> ! src/cpu/zero/vm/cppInterpreter_zero.cpp Changeset: d506b2cf2ad0 Author: dholmes Date: 2012-05-09 04:32 -0400 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/d506b2cf2ad0 Merge Changeset: 78d2ae5ab35b Author: nloodin Date: 2012-05-09 16:24 +0200 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/78d2ae5ab35b 7163117: Agent can't connect to process on Mac OSX Reviewed-by: dholmes, coleenp, sla, minqi, kvn ! agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java ! agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java ! agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java ! agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java ! agent/src/share/classes/sun/jvm/hotspot/debugger/proc/ProcDebuggerLocal.java ! agent/src/share/classes/sun/jvm/hotspot/debugger/remote/RemoteDebuggerClient.java ! agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java ! agent/src/share/classes/sun/jvm/hotspot/ui/classbrowser/HTMLGenerator.java Changeset: 037973617842 Author: kevinw Date: 2012-05-11 17:24 +0100 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/037973617842 7157734: hotspot test scripts not testing 64-bit JVM under JPRT/JTREG. Reviewed-by: kvn ! test/compiler/6894807/Test6894807.sh ! test/gc/6941923/test6941923.sh ! test/runtime/6626217/Test6626217.sh ! test/runtime/6878713/Test6878713.sh ! test/runtime/6929067/Test6929067.sh ! test/runtime/7020373/Test7020373.sh ! test/runtime/7051189/Xchecksig.sh ! test/runtime/7158988/TestFieldMonitor.sh Changeset: 2f4819f92dc7 Author: zgu Date: 2012-05-10 18:19 -0400 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/2f4819f92dc7 Merge - src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/binaryTreeDictionary.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.hpp - src/share/vm/gc_implementation/concurrentMarkSweep/freeList.cpp - src/share/vm/gc_implementation/concurrentMarkSweep/freeList.hpp Changeset: b4f7c4315c36 Author: zgu Date: 2012-05-12 06:50 -0400 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/b4f7c4315c36 Merge Changeset: 7d4e6dabc6bf Author: dcubed Date: 2012-05-15 10:52 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/7d4e6dabc6bf 7165060: dtrace tests fail with FDS debug info files Summary: Work around 'gobjcopy --add-gnu-debuglink' failure by adding a temporary tool that adds the '.gnu_debuglink' section and nothing more. Reviewed-by: sspitsyn, acorn + make/solaris/makefiles/add_gnu_debuglink.make ! make/solaris/makefiles/vm.make + src/os/solaris/add_gnu_debuglink/add_gnu_debuglink.c Changeset: 80b9cc90b643 Author: dcubed Date: 2012-05-15 11:27 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/80b9cc90b643 Merge ! make/solaris/makefiles/defs.make ! make/solaris/makefiles/vm.make Changeset: 9793f47cdebc Author: dcubed Date: 2012-05-15 15:16 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/9793f47cdebc 7169102: 7165060 merge lost changes to make/windows/makefiles/defs.make Reviewed-by: sspitsyn, acorn ! make/windows/makefiles/defs.make Changeset: 7432b9db36ff Author: nloodin Date: 2012-05-10 15:44 +0200 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/7432b9db36ff 7165755: OS Information much longer on linux than other platforms Reviewed-by: sla, dholmes ! src/os/bsd/vm/os_bsd.cpp ! src/os/linux/vm/os_linux.cpp ! src/os/linux/vm/os_linux.hpp ! src/os/posix/vm/os_posix.cpp + src/os/posix/vm/os_posix.hpp ! src/os/solaris/vm/os_solaris.cpp ! src/os/solaris/vm/os_solaris.hpp ! src/os/windows/vm/os_windows.cpp ! src/os/windows/vm/os_windows.hpp ! src/share/vm/runtime/os.hpp Changeset: 198dcc84088c Author: dcubed Date: 2012-05-16 12:47 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/198dcc84088c 7169409: enabling ZIP_DEBUGINFO_FILES causes unexpected test failures on Windows X86 Summary: Disable ZIP_DEBUGINFO_FILES by default on Windows. Reviewed-by: acorn ! make/windows/makefiles/defs.make Changeset: 4b37c0dafe3a Author: dcubed Date: 2012-05-18 09:15 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/4b37c0dafe3a 7170010: conditional "ZIP_DEBUGINFO_FILES ?= 0" setting is not reliable on Windows Summary: Always disable ZIP_DEBUGINFO_FILES on Windows. Reviewed-by: acorn ! make/windows/makefiles/defs.make Changeset: cee14a6fc5ac Author: zgu Date: 2012-05-22 20:29 -0400 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/cee14a6fc5ac Merge Changeset: 6759698e3140 Author: roland Date: 2012-05-15 10:10 +0200 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/6759698e3140 7133857: exp() and pow() should use the x87 ISA on x86 Summary: use x87 instructions to implement exp() and pow() in interpreter/c1/c2. Reviewed-by: kvn, never, twisti ! src/cpu/sparc/vm/c1_LIRGenerator_sparc.cpp ! src/cpu/sparc/vm/interpreter_sparc.cpp ! src/cpu/x86/vm/assembler_x86.cpp ! src/cpu/x86/vm/assembler_x86.hpp ! src/cpu/x86/vm/c1_LIRAssembler_x86.cpp ! src/cpu/x86/vm/c1_LIRGenerator_x86.cpp ! src/cpu/x86/vm/c1_LinearScan_x86.cpp ! src/cpu/x86/vm/interpreter_x86_32.cpp ! src/cpu/x86/vm/interpreter_x86_64.cpp ! src/cpu/x86/vm/stubGenerator_x86_32.cpp ! src/cpu/x86/vm/stubGenerator_x86_64.cpp ! src/cpu/x86/vm/templateInterpreter_x86_32.cpp ! src/cpu/x86/vm/templateInterpreter_x86_64.cpp ! src/cpu/x86/vm/x86_32.ad ! src/cpu/x86/vm/x86_64.ad ! src/share/vm/c1/c1_GraphBuilder.cpp ! src/share/vm/c1/c1_LIR.cpp ! src/share/vm/c1/c1_LIR.hpp ! src/share/vm/c1/c1_LIRAssembler.cpp ! src/share/vm/c1/c1_LIRGenerator.cpp ! src/share/vm/c1/c1_LinearScan.cpp ! src/share/vm/interpreter/abstractInterpreter.hpp ! src/share/vm/interpreter/interpreter.cpp ! src/share/vm/interpreter/templateInterpreter.cpp ! src/share/vm/opto/library_call.cpp ! src/share/vm/opto/subnode.cpp Changeset: 4073d9478a90 Author: roland Date: 2012-05-18 15:50 +0200 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/4073d9478a90 7167254: Crash on OSX in Enumerator.nextElement() with compressed oops Summary: null checks in "compressed oops with base" mode may trigger a SIGBUS rather than a SIGSEGV. Reviewed-by: dsamersoff, dcubed, rbackman, kvn ! src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp Changeset: cdd249497b34 Author: twisti Date: 2012-05-18 12:20 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/cdd249497b34 7170053: crash in C2 when using -XX:+CountCompiledCalls Reviewed-by: kvn, twisti Contributed-by: Krystal Mok <sajia(a)taobao.com> ! src/share/vm/opto/doCall.cpp Changeset: e2961d14584b Author: roland Date: 2012-05-21 09:46 +0200 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/e2961d14584b 7169934: pow(x,y) or x64 computes incorrect result when x<0 and y is an odd integer Summary: bad test for parity of y in pow(x,y) (c1, interpreter) Reviewed-by: kvn, twisti ! src/cpu/x86/vm/assembler_x86.cpp Changeset: 7089278210e2 Author: kvn Date: 2012-05-24 18:39 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/7089278210e2 Merge Changeset: 785573170238 Author: amurillo Date: 2012-05-25 14:45 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/785573170238 Merge Changeset: 37add4fa0296 Author: amurillo Date: 2012-05-25 14:45 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/37add4fa0296 Added tag hs24-b12 for changeset 785573170238 ! .hgtags Changeset: 2040997cba56 Author: cl Date: 2012-06-01 14:12 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/2040997cba56 Added tag jdk8-b41 for changeset 37add4fa0296 ! .hgtags

1 0

hg: jdk8/tl/jdk: 5 new changesets
by lana.steuck＠oracle.com 06 Jun '12

06 Jun '12

Changeset: edb02bee325e Author: ihse Date: 2012-05-25 18:55 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/edb02bee325e 7172014: Remove empty and unused javah include files Reviewed-by: ohair, erikj ! src/share/native/sun/awt/image/cvutils/img_dcm.h ! src/share/native/sun/awt/image/cvutils/img_dcm8.h ! src/share/native/sun/java2d/pipe/SpanClipRenderer.c ! src/solaris/native/sun/awt/initIDs.c Changeset: 8b4dd321b8a2 Author: dholmes Date: 2012-05-30 00:37 -0400 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/8b4dd321b8a2 7171653: 32-bit cross-compile on 64-bit build host generates 64-bit data for awt/X11 leading to crash Reviewed-by: ohair, anthony ! make/sun/xawt/Makefile ! makefiles/sun/xawt/Makefile Changeset: 4eac56f073ea Author: katleman Date: 2012-05-30 15:59 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/4eac56f073ea Merge Changeset: cf5c1f6fbc5b Author: cl Date: 2012-06-01 14:12 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/cf5c1f6fbc5b Added tag jdk8-b41 for changeset 4eac56f073ea ! .hgtags Changeset: 91d05db156d3 Author: lana Date: 2012-06-05 17:40 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jdk/rev/91d05db156d3 Merge

1 0

hg: jdk8/tl/jaxws: Added tag jdk8-b41 for changeset f2072b164b05
by lana.steuck＠oracle.com 06 Jun '12

06 Jun '12

Changeset: 1f20f37818a9 Author: cl Date: 2012-06-01 14:12 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jaxws/rev/1f20f37818a9 Added tag jdk8-b41 for changeset f2072b164b05 ! .hgtags

1 0

hg: jdk8/tl/langtools: 2 new changesets
by lana.steuck＠oracle.com 06 Jun '12

06 Jun '12

Changeset: 02c5a3575539 Author: cl Date: 2012-06-01 14:12 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/langtools/rev/02c5a3575539 Added tag jdk8-b41 for changeset 179fa85aeefa ! .hgtags Changeset: 252f8b7473e1 Author: lana Date: 2012-06-05 17:40 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/langtools/rev/252f8b7473e1 Merge

1 0

hg: jdk8/tl/jaxp: Added tag jdk8-b41 for changeset 6f5c0e17415d
by lana.steuck＠oracle.com 06 Jun '12

06 Jun '12

Changeset: 39ee03c16021 Author: cl Date: 2012-06-01 14:12 -0700 URL: http://hg.openjdk.java.net/jdk8/tl/jaxp/rev/39ee03c16021 Added tag jdk8-b41 for changeset 6f5c0e17415d ! .hgtags

1 0