hg: jdk8/tl/nashorn: 3 new changesets

2013-06-05 Thread lana . steuck
Changeset: 4463e94d9b0d
Author:lana
Date:  2013-05-29 16:59 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/nashorn/rev/4463e94d9b0d

Merge

- src/jdk/nashorn/internal/runtime/options/ValueOption.java
- src/jdk/nashorn/internal/runtime/regexp/DefaultRegExp.java
- src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompiler.java
- src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompilerSupport.java
- src/jdk/nashorn/internal/runtime/regexp/joni/CaptureTreeNode.java
- src/jdk/nashorn/internal/runtime/regexp/joni/NameEntry.java
- src/jdk/nashorn/internal/runtime/regexp/joni/NativeMachine.java
- src/jdk/nashorn/internal/runtime/regexp/joni/UnsetAddrList.java
- src/jdk/nashorn/internal/runtime/regexp/joni/ast/CTypeNode.java
- src/jdk/nashorn/internal/runtime/regexp/joni/ast/CallNode.java
- src/jdk/nashorn/internal/runtime/regexp/joni/bench/AbstractBench.java
- src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchGreedyBacktrack.java
- src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchRailsRegs.java
- src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchSeveralRegexps.java
- src/jdk/nashorn/internal/runtime/regexp/joni/constants/Reduce.java
- src/jdk/nashorn/internal/runtime/regexp/joni/encoding/AsciiTables.java
- src/jdk/nashorn/internal/runtime/regexp/joni/encoding/PosixBracket.java
- src/jdk/nashorn/internal/runtime/regexp/joni/encoding/Ptr.java
- src/netscape/javascript/JSObject.java

Changeset: ddbf41575a2b
Author:lana
Date:  2013-06-03 23:24 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/nashorn/rev/ddbf41575a2b

Merge

- src/jdk/nashorn/internal/runtime/options/ValueOption.java
- src/jdk/nashorn/internal/runtime/regexp/DefaultRegExp.java
- src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompiler.java
- src/jdk/nashorn/internal/runtime/regexp/joni/AsmCompilerSupport.java
- src/jdk/nashorn/internal/runtime/regexp/joni/CaptureTreeNode.java
- src/jdk/nashorn/internal/runtime/regexp/joni/NameEntry.java
- src/jdk/nashorn/internal/runtime/regexp/joni/NativeMachine.java
- src/jdk/nashorn/internal/runtime/regexp/joni/UnsetAddrList.java
- src/jdk/nashorn/internal/runtime/regexp/joni/ast/CTypeNode.java
- src/jdk/nashorn/internal/runtime/regexp/joni/ast/CallNode.java
- src/jdk/nashorn/internal/runtime/regexp/joni/bench/AbstractBench.java
- src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchGreedyBacktrack.java
- src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchRailsRegs.java
- src/jdk/nashorn/internal/runtime/regexp/joni/bench/BenchSeveralRegexps.java
- src/jdk/nashorn/internal/runtime/regexp/joni/constants/Reduce.java
- src/jdk/nashorn/internal/runtime/regexp/joni/encoding/AsciiTables.java
- src/jdk/nashorn/internal/runtime/regexp/joni/encoding/PosixBracket.java
- src/jdk/nashorn/internal/runtime/regexp/joni/encoding/Ptr.java
- src/netscape/javascript/JSObject.java

Changeset: d2bd881976b5
Author:lana
Date:  2013-06-04 21:38 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/nashorn/rev/d2bd881976b5

Merge




hg: jdk8/tl: 3 new changesets

2013-06-05 Thread lana . steuck
Changeset: 78852ce176db
Author:jqzuo
Date:  2013-05-28 20:03 +0200
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/78852ce176db

8014762: Add JMC configure option mapping to Jprt.gmk
Summary: Need to add the mapping between JPRT env var and configure flag for 
JMC, from ALT_JMC_ZIP_DIR to --with-jmc-zip-dir (same pattern as for Javafx)
Reviewed-by: tbell, erikj
Contributed-by: klara.w...@oracle.com

! common/autoconf/generated-configure.sh
! common/makefiles/Jprt.gmk

Changeset: c22d59e3f06e
Author:pbhat
Date:  2013-05-29 11:02 -0400
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/c22d59e3f06e

Merge


Changeset: ea6f3bf82903
Author:jqzuo
Date:  2013-06-04 00:12 -0400
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/ea6f3bf82903

Merge

! common/autoconf/generated-configure.sh



hg: jdk8/tl/jaxp: 3 new changesets

2013-06-05 Thread lana . steuck
Changeset: 627c265d6e0c
Author:lana
Date:  2013-05-29 16:57 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jaxp/rev/627c265d6e0c

Merge

- src/com/sun/org/apache/xerces/internal/xinclude/ObjectFactory.java
- src/com/sun/org/apache/xml/internal/serialize/ObjectFactory.java

Changeset: d583a491d63c
Author:lana
Date:  2013-06-03 23:19 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jaxp/rev/d583a491d63c

Merge

- src/com/sun/org/apache/xerces/internal/xinclude/ObjectFactory.java
- src/com/sun/org/apache/xml/internal/serialize/ObjectFactory.java

Changeset: e996ea806630
Author:lana
Date:  2013-06-04 21:33 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jaxp/rev/e996ea806630

Merge




hg: jdk8/tl/langtools: 3 new changesets

2013-06-05 Thread lana . steuck
Changeset: 18943a1b7a47
Author:lana
Date:  2013-05-29 16:59 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/18943a1b7a47

Merge

- test/tools/javac/HiddenAbstractMethod/Test
- test/tools/javac/NonAmbiguousField/Test

Changeset: 2c5a568ee36e
Author:lana
Date:  2013-06-03 23:24 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/2c5a568ee36e

Merge

- test/tools/javac/HiddenAbstractMethod/Test
- test/tools/javac/NonAmbiguousField/Test

Changeset: 9acd0f8d6e44
Author:lana
Date:  2013-06-04 21:38 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/9acd0f8d6e44

Merge




hg: jdk8/tl/jdk: 23 new changesets

2013-06-05 Thread lana . steuck
Changeset: 93de1ab38793
Author:jchen
Date:  2013-05-17 10:04 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/93de1ab38793

8003444: Fix potential NULL pointer dereference
Reviewed-by: jgodinez, prr

! src/share/native/sun/java2d/cmm/lcms/cmscgats.c
! src/share/native/sun/java2d/cmm/lcms/cmslut.c

Changeset: 0cec8dc2bcf8
Author:lana
Date:  2013-05-22 19:35 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/0cec8dc2bcf8

Merge

- make/com/sun/script/Makefile
- make/sun/org/Makefile
- make/sun/org/mozilla/Makefile
- make/sun/org/mozilla/javascript/Makefile
- src/share/classes/com/sun/script/javascript/ExternalScriptable.java
- src/share/classes/com/sun/script/javascript/JSAdapter.java
- src/share/classes/com/sun/script/javascript/JavaAdapter.java
- 
src/share/classes/com/sun/script/javascript/META-INF/services/javax.script.ScriptEngineFactory
- src/share/classes/com/sun/script/javascript/RhinoClassShutter.java
- src/share/classes/com/sun/script/javascript/RhinoCompiledScript.java
- src/share/classes/com/sun/script/javascript/RhinoScriptEngine.java
- src/share/classes/com/sun/script/javascript/RhinoScriptEngineFactory.java
- src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
- src/share/classes/com/sun/script/javascript/RhinoWrapFactory.java
- src/share/classes/com/sun/script/util/BindingsBase.java
- src/share/classes/com/sun/script/util/BindingsEntrySet.java
- src/share/classes/com/sun/script/util/BindingsImpl.java
- src/share/classes/com/sun/script/util/InterfaceImplementor.java
- src/share/classes/com/sun/script/util/ScriptEngineFactoryBase.java
- src/share/classes/java/time/format/DateTimeFormatSymbols.java
- 
src/share/classes/sun/nio/cs/ext/META-INF/services/java.nio.charset.spi.CharsetProvider
- test/java/lang/Thread/StackTraces.java
- test/java/time/tck/java/time/format/TCKDateTimeFormatSymbols.java
- test/java/time/test/java/time/format/TestDateTimeFormatSymbols.java
- test/java/util/logging/bundlesearch/LoadItUp.java
- test/sun/security/provider/certpath/X509CertPath/ForwardBuildCompromised.java
- test/sun/security/provider/certpath/X509CertPath/ReverseBuildCompromised.java
- test/sun/security/provider/certpath/X509CertPath/ValidateCompromised.java

Changeset: 0208f5f12dc3
Author:jchen
Date:  2013-05-23 12:16 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/0208f5f12dc3

8012629: java.lang.UnsatisfiedLinkError exception throw by getAllFonts() on 
MacOSX
Reviewed-by: bae, prr

! make/sun/awt/FILES_c_unix.gmk
! make/sun/awt/FILES_export_unix.gmk
! make/sun/awt/mawt.gmk
! makefiles/CompileNativeLibraries.gmk
! src/macosx/native/sun/font/AWTFont.m

Changeset: f24f9038e050
Author:prr
Date:  2013-05-24 09:31 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/f24f9038e050

8008535: JDK7 Printing : CJK and Latin Text in a string overlap
Reviewed-by: bae, jgodinez

! src/windows/classes/sun/awt/windows/WPathGraphics.java
+ test/java/awt/print/PrinterJob/PrintLatinCJKTest.java

Changeset: f4ad2fa22474
Author:jgodinez
Date:  2013-05-29 09:18 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/f4ad2fa22474

7183520: [macosx]Unable to print out the defined page for 
2D_PrintingTiger/JTablePrintPageRangesTest.
Reviewed-by: bae, prr

! src/macosx/classes/sun/lwawt/macosx/CPrinterJob.java

Changeset: 7e2a887a069e
Author:jgodinez
Date:  2013-05-29 09:46 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/7e2a887a069e

8012381: [macosx]Unable to print out the defined page for 
2D_PrintingTiger/JTablePrintPageRangesTest
Reviewed-by: jchen, prr

! src/solaris/classes/sun/print/IPPPrintService.java
! test/java/awt/print/PrinterJob/Collate2DPrintingTest.java

Changeset: 8ac29ee867fd
Author:lana
Date:  2013-05-29 16:54 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/8ac29ee867fd

Merge


Changeset: 85df65495177
Author:mcherkas
Date:  2013-05-21 03:20 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/85df65495177

7011777: JDK 6 parses html text with script tags within comments differently 
from previous releases
Reviewed-by: alexsch
Contributed-by: Dmitry Markov dmitry.mar...@oracle.com

! src/share/classes/javax/swing/text/html/parser/Parser.java
+ test/javax/swing/text/html/parser/Parser/7011777/bug7011777.java

Changeset: e36d0b9ed018
Author:alitvinov
Date:  2013-05-21 05:02 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/e36d0b9ed018

8005607: Recursion in J2DXErrHandler() Causes a Stack Overflow on Linux
Reviewed-by: art, anthony, prr

! src/solaris/classes/sun/awt/X11/MotifDnDConstants.java
! src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java
! src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java
! src/solaris/classes/sun/awt/X11/XConstants.java
! src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java
! src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java
! src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java
! 

hg: jdk8/tl/jdk: 8003895: java/nio/channels/AsynchronousChannelGroup/Unbounded.java failing again [win64]

2013-06-05 Thread alan . bateman
Changeset: 8a9f897a57d6
Author:alanb
Date:  2013-06-05 11:12 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/8a9f897a57d6

8003895: java/nio/channels/AsynchronousChannelGroup/Unbounded.java failing 
again [win64]
Reviewed-by: chegar

! test/ProblemList.txt
! test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java



hg: jdk8/tl/jdk: 8013649: HashMap spliterator tryAdvance() encounters remaining elements after forEachRemaining()

2013-06-05 Thread paul . sandoz
Changeset: de11b20f8c01
Author:psandoz
Date:  2013-05-31 10:53 +0200
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/de11b20f8c01

8013649: HashMap spliterator tryAdvance() encounters remaining elements after 
forEachRemaining()
Reviewed-by: chegar

! src/share/classes/java/util/HashMap.java
! src/share/classes/java/util/WeakHashMap.java
! test/java/util/Spliterator/SpliteratorTraversingAndSplittingTest.java



hg: jdk8/tl/jdk: 8015880: GenerateBreakIteratorData build warning

2013-06-05 Thread alan . bateman
Changeset: ae700bdb68b6
Author:alanb
Date:  2013-06-05 13:57 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/ae700bdb68b6

8015880: GenerateBreakIteratorData build warning
Reviewed-by: peytoia

! make/tools/src/build/tools/generatebreakiteratordata/CharSet.java



hg: jdk8/tl/jdk: 8015604: JDP packets containing ideographic characters are broken

2013-06-05 Thread dmitry . samersoff
Changeset: df1b35c7901d
Author:dsamersoff
Date:  2013-06-05 18:20 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/df1b35c7901d

8015604: JDP packets containing ideographic characters are broken
Summary: Code uses string length rather than byte array length and non ascii 
entry brakes packet.
Reviewed-by: dholmes, jbachorik, sla

! src/share/classes/sun/management/jdp/JdpPacketWriter.java
! test/sun/management/jdp/JdpUnitTest.java



hg: jdk8/tl/jdk: 8011719: Properties.loadFromXML fails with a chunked HTTP connection

2013-06-05 Thread chris . hegarty
Changeset: 5edcc8ca4146
Author:chegar
Date:  2013-06-05 16:06 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/5edcc8ca4146

8011719: Properties.loadFromXML fails with a chunked HTTP connection
Reviewed-by: michaelm

! src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java
+ test/sun/net/www/protocol/http/HttpStreams.java



hg: jdk8/tl/jdk: 8015963: Add at since tags to new ConcurrentHashMap methods

2013-06-05 Thread chris . hegarty
Changeset: c1af6b5a979a
Author:chegar
Date:  2013-06-05 16:23 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/c1af6b5a979a

8015963: Add at since tags to new ConcurrentHashMap methods
Reviewed-by: shade, martin

! src/share/classes/java/util/concurrent/ConcurrentHashMap.java



hg: jdk8/tl/jdk: 7150256: Add back Diagnostic Command JMX API

2013-06-05 Thread frederic . parain
Changeset: e857b2a3ecee
Author:fparain
Date:  2013-06-05 08:41 -0700
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/e857b2a3ecee

7150256: Add back Diagnostic Command JMX API
Reviewed-by: mchung, jbachorik

! make/java/management/Exportedfiles.gmk
! make/java/management/FILES_c.gmk
! make/java/management/mapfile-vers
! makefiles/mapfiles/libmanagement/mapfile-vers
+ src/share/classes/com/sun/management/DiagnosticCommandMBean.java
! src/share/classes/java/lang/management/ManagementFactory.java
+ src/share/classes/sun/management/DiagnosticCommandArgumentInfo.java
+ src/share/classes/sun/management/DiagnosticCommandImpl.java
+ src/share/classes/sun/management/DiagnosticCommandInfo.java
! src/share/classes/sun/management/ManagementFactoryHelper.java
! src/share/classes/sun/management/VMManagement.java
! src/share/classes/sun/management/VMManagementImpl.java
! src/share/javavm/export/jmm.h
+ src/share/native/sun/management/DiagnosticCommandImpl.c
! src/share/native/sun/management/VMManagementImpl.c
+ 
test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanDoubleInvocationTest.java
+ test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanInvocationTest.java
+ test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanPermissionsTest.java
+ test/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTest.java
! test/java/lang/management/MXBean/MXBeanBehavior.java
! 
test/java/lang/management/ManagementFactory/MBeanServerMXBeanUnsupportedTest.java



Code Review Request: 7051862: CookiePolicy spec conflicts with CookiePolicy.ACCEPT_ORIGINAL_SERVER

2013-06-05 Thread Kurchi Hazra


Hi,

Please review this change to fix 7051862. For ACCEPT_ORIGINAL_SERVER, 
shouldAccept() throws a NullPointerException for null arguments.
Out of the many options to fix this, I think the best way is to return 
false if either of the arguments is null - based on the fact that

HttpCookie.domainMathes() returns false for null arguments.

 Bug: http://bugs.sun.com/view_bug.do?bug_id=7051862
 Webrev: http://cr.openjdk.java.net/~khazra/7051862/webrev.00/

Thanks,
Kurchi