hg: jdk7/tl/jdk: 9 new changesets

2011-04-26 Thread lana . steuck
Changeset: fb1d421c1e97
Author:jrose
Date:  2011-04-09 21:38 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/fb1d421c1e97

7019529: JSR292: java/dyn/ClassValueTest.java depends on sub-test execution 
order
Summary: Test should not use static variables, because they may contain stale 
values.
Reviewed-by: twisti

! test/java/lang/invoke/ClassValueTest.java

Changeset: 861e16acfea7
Author:trims
Date:  2011-04-19 18:14 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/861e16acfea7

Merge


Changeset: c7452722c57d
Author:yhuang
Date:  2011-04-18 23:00 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/c7452722c57d

7036905: [de] dem - the german mark display name is incorrect
Reviewed-by: naoto

! src/share/classes/sun/util/resources/CurrencyNames_de.properties
! src/share/classes/sun/util/resources/CurrencyNames_it.properties
! test/java/util/Currency/CurrencyTest.java
! test/sun/text/resources/LocaleData
! test/sun/text/resources/LocaleDataTest.java

Changeset: 114089fb817c
Author:mfang
Date:  2011-04-19 10:55 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/114089fb817c

Merge

! test/sun/text/resources/LocaleDataTest.java

Changeset: 7e7c898b6352
Author:mfang
Date:  2011-04-19 11:24 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/7e7c898b6352

Merge


Changeset: 5f6f3175decc
Author:asaha
Date:  2011-04-20 14:22 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/5f6f3175decc

7018125: Reverting the JFB version string for JDK releases
Reviewed-by: katleman

! make/common/shared/Defs.gmk

Changeset: d80954a89b49
Author:cl
Date:  2011-04-20 16:05 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/d80954a89b49

Merge


Changeset: ca4f216c0bae
Author:lana
Date:  2011-04-21 11:11 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/ca4f216c0bae

Merge


Changeset: 3669d17e7799
Author:lana
Date:  2011-04-21 13:32 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/3669d17e7799

Merge




hg: jdk7/tl/jdk: 9 new changesets

2009-09-07 Thread tim . bell
Changeset: 80368890a2a0
Author:andrew
Date:  2009-08-18 19:50 +0100
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/80368890a2a0

6873059: Explicitly use -source 6 -target 6 when compiling with the boot jdk 
javac
Summary: The bootstrap javac currently uses the default source and targets of 
the boot javac
Reviewed-by: ohair

! make/common/shared/Defs-java.gmk

Changeset: 43465920bf47
Author:xdono
Date:  2009-08-18 19:53 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/43465920bf47

Merge

- test/java/util/concurrent/ConcurrentLinkedQueue/ConcurrentQueueLoops.java
- test/java/util/concurrent/ConcurrentLinkedQueue/LoopHelpers.java

Changeset: b3aac0db5586
Author:tbell
Date:  2009-08-21 12:12 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/b3aac0db5586

6705913: freetype_versioncheck.exe - Unable To Locate Component
Summary: Update freetype_versioncheck to deal with newer Visual Studio releases
Reviewed-by: ohair

! make/tools/freetypecheck/Makefile
! make/tools/freetypecheck/freetypecheck.c

Changeset: e0b26d347302
Author:xdono
Date:  2009-08-24 17:26 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/e0b26d347302

Merge


Changeset: b3f3240135f0
Author:xdono
Date:  2009-09-01 13:03 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/b3f3240135f0

Merge

- src/share/classes/sun/nio/ch/AbstractFuture.java

Changeset: ce3fde68c495
Author:xdono
Date:  2009-09-03 10:53 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/ce3fde68c495

Added tag jdk7-b71 for changeset b3f3240135f0

! .hgtags

Changeset: ed0863629d28
Author:tbell
Date:  2009-09-03 18:32 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/ed0863629d28

Merge

- src/share/native/java/util/zip/zlib-1.1.3/ChangeLog
- src/share/native/java/util/zip/zlib-1.1.3/README
- src/share/native/java/util/zip/zlib-1.1.3/compress.c
- src/share/native/java/util/zip/zlib-1.1.3/deflate.c
- src/share/native/java/util/zip/zlib-1.1.3/deflate.h
- src/share/native/java/util/zip/zlib-1.1.3/doc/algorithm.doc
- src/share/native/java/util/zip/zlib-1.1.3/example.c
- src/share/native/java/util/zip/zlib-1.1.3/gzio.c
- src/share/native/java/util/zip/zlib-1.1.3/infblock.c
- src/share/native/java/util/zip/zlib-1.1.3/infblock.h
- src/share/native/java/util/zip/zlib-1.1.3/infcodes.c
- src/share/native/java/util/zip/zlib-1.1.3/infcodes.h
- src/share/native/java/util/zip/zlib-1.1.3/inffast.c
- src/share/native/java/util/zip/zlib-1.1.3/inffast.h
- src/share/native/java/util/zip/zlib-1.1.3/inffixed.h
- src/share/native/java/util/zip/zlib-1.1.3/inflate.c
- src/share/native/java/util/zip/zlib-1.1.3/inftrees.c
- src/share/native/java/util/zip/zlib-1.1.3/inftrees.h
- src/share/native/java/util/zip/zlib-1.1.3/infutil.c
- src/share/native/java/util/zip/zlib-1.1.3/infutil.h
- src/share/native/java/util/zip/zlib-1.1.3/minigzip.c
- src/share/native/java/util/zip/zlib-1.1.3/trees.c
- src/share/native/java/util/zip/zlib-1.1.3/trees.h
- src/share/native/java/util/zip/zlib-1.1.3/uncompr.c
- src/share/native/java/util/zip/zlib-1.1.3/zadler32.c
- src/share/native/java/util/zip/zlib-1.1.3/zconf.h
- src/share/native/java/util/zip/zlib-1.1.3/zcrc32.c
- src/share/native/java/util/zip/zlib-1.1.3/zlib.h
- src/share/native/java/util/zip/zlib-1.1.3/zutil.c
- src/share/native/java/util/zip/zlib-1.1.3/zutil.h
- test/java/util/concurrent/LinkedBlockingQueue/LastElement.java
- test/java/util/concurrent/LinkedBlockingQueue/OfferRemoveLoops.java

Changeset: 658a4255c797
Author:tbell
Date:  2009-09-04 17:07 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/658a4255c797

Merge


Changeset: abb69e8b1774
Author:tbell
Date:  2009-09-06 23:14 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/abb69e8b1774

Merge




hg: jdk7/tl/jdk: 9 new changesets

2009-05-15 Thread tim . bell
Changeset: 878863c9072d
Author:vasya
Date:  2009-05-11 12:08 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/878863c9072d

Added tag jdk7-b58 for changeset 9ba256e2e5c1

! .hgtags

Changeset: 2007e3d9c195
Author:anthony
Date:  2009-05-05 14:45 +0400
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2007e3d9c195

6762511: Translucency is not working on Linux using Metacity
Summary: Introduced additional blits and new X11 surface types (ARGB, ABGR)
Reviewed-by: art, avu

! src/solaris/classes/sun/awt/X11GraphicsConfig.java
! src/solaris/classes/sun/java2d/x11/X11PMBlitBgLoops.java
! src/solaris/classes/sun/java2d/x11/X11PMBlitLoops.java
! src/solaris/classes/sun/java2d/x11/X11SurfaceData.java
! src/solaris/native/sun/awt/X11Color.c
! src/solaris/native/sun/awt/awt_GraphicsEnv.c
! src/solaris/native/sun/awt/awt_p.h

Changeset: ba95c9101e50
Author:art
Date:  2009-05-06 12:39 +0400
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/ba95c9101e50

6837004: java.awt.GraphicsDevice.setFullScreenWindow throws NPE for windows 
with background color not set
Reviewed-by: yan, dcherepanov

! src/share/classes/java/awt/GraphicsDevice.java
+ test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java

Changeset: b28b073e72b6
Author:anthony
Date:  2009-05-06 20:06 +0400
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/b28b073e72b6

6838046: Rollback 6762511 due to build failure (6838003)
Reviewed-by: yan

! src/solaris/classes/sun/awt/X11GraphicsConfig.java
! src/solaris/classes/sun/java2d/x11/X11PMBlitBgLoops.java
! src/solaris/classes/sun/java2d/x11/X11PMBlitLoops.java
! src/solaris/classes/sun/java2d/x11/X11SurfaceData.java
! src/solaris/native/sun/awt/X11Color.c
! src/solaris/native/sun/awt/awt_GraphicsEnv.c
! src/solaris/native/sun/awt/awt_p.h

Changeset: 2b86dbc51d11
Author:yan
Date:  2009-05-06 09:37 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2b86dbc51d11

Merge


Changeset: 0c6f5f1c58fd
Author:yan
Date:  2009-05-12 00:40 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/0c6f5f1c58fd

Merge


Changeset: 2387e3b1994e
Author:jrose
Date:  2009-05-11 21:09 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2387e3b1994e

6839802: java.dyn needs to be on the CORE_PKGS list
Summary: fix makefile to expose the new APIs in the core list; edit some 
javadocs for correctness
Reviewed-by: mr

! make/common/Release.gmk
! make/docs/CORE_PKGS.gmk
! src/share/classes/java/dyn/CallSite.java
! src/share/classes/java/dyn/InvokeDynamic.java
! src/share/classes/java/dyn/Linkage.java
! src/share/classes/java/dyn/MethodHandles.java
! src/share/classes/java/dyn/MethodType.java

Changeset: 29180ef374c8
Author:jrose
Date:  2009-05-12 13:54 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/29180ef374c8

6839839: access checking logic is wrong at three points in MethodHandles
Summary: point fixes to access checking logic
Reviewed-by: mr

! src/share/classes/java/dyn/MethodHandles.java
! src/share/classes/sun/dyn/DirectMethodHandle.java
! src/share/classes/sun/dyn/MemberName.java
! src/share/classes/sun/dyn/MethodHandleImpl.java
! src/share/classes/sun/dyn/MethodHandleNatives.java
! src/share/classes/sun/dyn/util/VerifyAccess.java

Changeset: 2a5a1b269e89
Author:xdono
Date:  2009-05-12 14:05 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2a5a1b269e89

Merge




hg: jdk7/tl/jdk: 9 new changesets

2009-04-04 Thread tim . bell
Changeset: 3501cc282cd2
Author:xdono
Date:  2009-03-27 14:11 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/3501cc282cd2

Added tag jdk7-b52 for changeset bcbeadb4a5d7

! .hgtags

Changeset: 1bbbd1bf9be3
Author:xdono
Date:  2009-03-31 08:53 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/1bbbd1bf9be3

Merge

- src/share/classes/sun/misc/JavaIODeleteOnExitAccess.java

Changeset: 90873391a0e0
Author:ohair
Date:  2009-03-26 16:52 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/90873391a0e0

6822374: Windows: detect X64 when PROCESSOR_IDENTIFIER contains EM64T or Intel64
6822913: Consolidate make/jprt.config files, let JPRT manage this file make it 
optional in repos
Reviewed-by: tbell

! make/common/shared/Platform.gmk
! make/jdk_generic_profile.sh
- make/jprt.config

Changeset: 964cc8eb3232
Author:tbell
Date:  2009-03-31 15:27 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/964cc8eb3232

6819847: build is broken for OpenJDK with plugs
Reviewed-by: jjg, robilad, ohair

! make/Makefile
! make/common/Defs.gmk
! make/common/shared/Sanity-Settings.gmk
! make/java/redist/Makefile

Changeset: ecb7723aaa7c
Author:tbell
Date:  2009-04-01 04:44 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/ecb7723aaa7c

6824595: OpenJDK fix breaks product build for jdk7
Reviewed-by: xdono, ohair

! make/Makefile

Changeset: deced414c8e4
Author:xdono
Date:  2009-04-01 08:58 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/deced414c8e4

Merge

- src/share/classes/sun/misc/JavaIODeleteOnExitAccess.java

Changeset: a2033addca67
Author:ohair
Date:  2009-04-01 16:49 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/a2033addca67

6825175: Remove or disable sanity check on binary plugs
Reviewed-by: xdono

! make/common/shared/Sanity.gmk

Changeset: 8536cdffa32e
Author:xdono
Date:  2009-04-02 16:51 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/8536cdffa32e

Added tag jdk7-b53 for changeset a2033addca67

! .hgtags

Changeset: 17f50ed5fcab
Author:tbell
Date:  2009-04-03 10:29 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/17f50ed5fcab

Merge




hg: jdk7/tl/jdk: 9 new changesets

2009-03-15 Thread tim . bell
Changeset: 30bf00392b6d
Author:ohair
Date:  2009-01-31 17:31 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/30bf00392b6d

6799141: Build with --hash-style=both so that binaries can work on SuSE 10
Reviewed-by: tbell

! make/common/Defs-linux.gmk
! make/common/shared/Compiler-gcc.gmk
! make/common/shared/Compiler-msvc.gmk
! make/common/shared/Compiler-sun.gmk
+ make/common/shared/Defs-versions.gmk
! make/common/shared/Defs-windows.gmk
! make/common/shared/Defs.gmk
! make/common/shared/Platform.gmk
! make/common/shared/Sanity-Settings.gmk
! make/common/shared/Sanity.gmk

Changeset: dfb5a9a71c1c
Author:xdono
Date:  2009-02-27 15:13 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/dfb5a9a71c1c

Merge

- make/javax/sound/jsoundhs/FILES.gmk
- make/javax/sound/jsoundhs/Makefile
- make/javax/sound/jsoundhs/mapfile-vers
- src/share/classes/com/sun/beans/ObjectHandler.java
- src/share/lib/audio/soundbank.gm
- src/windows/native/sun/windows/UnicowsLoader.cpp
- src/windows/native/sun/windows/UnicowsLoader.h
- src/windows/native/sun/windows/awt_MMStub.cpp
- src/windows/native/sun/windows/awt_MMStub.h
- src/windows/native/sun/windows/awt_Multimon.h
- src/windows/native/sun/windows/awt_Unicode.cpp
- src/windows/native/sun/windows/awt_Unicode.h
- src/windows/native/sun/windows/awt_dlls.cpp
- src/windows/native/sun/windows/awt_dlls.h

Changeset: d71e3cc6c4e7
Author:xdono
Date:  2009-02-27 15:55 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/d71e3cc6c4e7

Merge

- src/solaris/classes/sun/nio/ch/FileDispatcher.java
- src/solaris/native/sun/nio/ch/FileDispatcher.c
- src/windows/classes/sun/nio/ch/FileDispatcher.java
- src/windows/native/sun/nio/ch/FileDispatcher.c

Changeset: abfccc052872
Author:xdono
Date:  2009-03-03 15:21 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/abfccc052872

Merge


Changeset: 83c0526fb9c9
Author:xdono
Date:  2009-03-09 11:43 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/83c0526fb9c9

Merge


Changeset: ca0976a15868
Author:xdono
Date:  2009-03-09 13:29 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/ca0976a15868

6814575: Update copyright year
Summary: Update copyright for files that have been modified in 2009, up to 03/09
Reviewed-by: katleman, tbell, ohair

! src/share/classes/java/lang/Thread.java
! src/share/classes/java/util/regex/Matcher.java
! src/share/classes/java/util/regex/Pattern.java
! src/share/classes/sun/security/krb5/Realm.java
! src/share/classes/sun/security/x509/AuthorityInfoAccessExtension.java
! src/share/native/java/util/zip/zip_util.c
! src/share/native/java/util/zip/zip_util.h
! src/solaris/native/java/net/NetworkInterface.c

Changeset: b1e3e3b8e6b2
Author:xdono
Date:  2009-03-09 13:34 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/b1e3e3b8e6b2

Merge


Changeset: 175504cc095d
Author:tbell
Date:  2009-03-09 23:37 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/175504cc095d

Merge


Changeset: c2ca4a97ba86
Author:tbell
Date:  2009-03-13 15:26 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/c2ca4a97ba86

Merge

- src/share/classes/sun/misc/JavaIODeleteOnExitAccess.java



hg: jdk7/tl/jdk: 9 new changesets

2008-09-18 Thread bradford . wetmore
Changeset: eb342082e2b6
Author:jccollet
Date:  2008-09-04 15:26 +0200
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/eb342082e2b6

6692802: HttpCookie needs to support HttpOnly attribute
Summary: Added HttpOnly tag support to HttpCookie class.
Reviewed-by: chegar, michaelm

! src/share/classes/java/net/HttpCookie.java
! test/java/net/CookieHandler/TestHttpCookie.java

Changeset: d276b0716d13
Author:wetmore
Date:  2008-09-05 00:43 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/d276b0716d13

Merge


Changeset: bcb61dfc8514
Author:weijun
Date:  2008-09-08 14:17 +0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/bcb61dfc8514

6740833: krb5.conf does not accept kdc=hostname (no spaces around =)
Reviewed-by: xuelei

! src/share/classes/sun/security/krb5/Config.java

Changeset: b0378bb50d83
Author:michaelm
Date:  2008-09-11 17:46 +0100
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/b0378bb50d83

6744329: Exception in light weight http server code
Reviewed-by: chegar

! src/share/classes/sun/net/httpserver/ChunkedOutputStream.java
+ test/com/sun/net/httpserver/bugs/B6744329.java

Changeset: 80fe10573687
Author:mullan
Date:  2008-09-11 14:05 -0400
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/80fe10573687

6465942: Add problem identification facility to the CertPathValidator framework
Summary: Add support to the java.security.cert APIs for determining the reason 
that a certification path is invalid.
Reviewed-by: vinnie

! src/share/classes/java/security/cert/CertPathValidatorException.java
+ src/share/classes/java/security/cert/PKIXReason.java
! src/share/classes/sun/security/provider/certpath/BasicChecker.java
! src/share/classes/sun/security/provider/certpath/ConstraintsChecker.java
! src/share/classes/sun/security/provider/certpath/CrlRevocationChecker.java
! src/share/classes/sun/security/provider/certpath/ForwardBuilder.java
! src/share/classes/sun/security/provider/certpath/KeyChecker.java
! src/share/classes/sun/security/provider/certpath/OCSPChecker.java
! src/share/classes/sun/security/provider/certpath/PKIXCertPathValidator.java
! 
src/share/classes/sun/security/provider/certpath/PKIXMasterCertPathValidator.java
! src/share/classes/sun/security/provider/certpath/PolicyChecker.java
! src/share/classes/sun/security/provider/certpath/ReverseBuilder.java
! src/share/classes/sun/security/provider/certpath/SunCertPathBuilder.java
! 
test/java/security/cert/CertPathValidator/nameConstraintsRFC822/ValidateCertPath.java
+ test/java/security/cert/CertPathValidatorException/ReasonTest.java
+ test/java/security/cert/CertPathValidatorException/Serial.java
+ test/java/security/cert/CertPathValidatorException/cert_file
+ test/java/security/cert/CertPathValidatorException/jdk6.serial
! test/java/security/cert/PolicyNode/GetPolicyQualifiers.java

Changeset: 482a1857b598
Author:mullan
Date:  2008-09-11 18:13 -0400
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/482a1857b598

Merge


Changeset: 80fd09f239f4
Author:wetmore
Date:  2008-09-15 00:41 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/80fd09f239f4

Merge


Changeset: 0100b3e66894
Author:wetmore
Date:  2008-09-16 00:34 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/0100b3e66894

Merge


Changeset: e81a1ebde376
Author:wetmore
Date:  2008-09-18 00:39 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/e81a1ebde376

Merge




hg: jdk7/tl/jdk: 9 new changesets

2008-06-16 Thread bradford . wetmore
Changeset: e8201036fc65
Author:xuelei
Date:  2008-06-04 09:56 +0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/e8201036fc65

6690018: RSAClientKeyExchange NullPointerException
Summary: checking certificate key length for RSA_EXPORT key exchange
Reviewed-by: wetmore, mullan

! src/share/classes/sun/security/ssl/ClientHandshaker.java
+ 
test/sun/security/ssl/com/sun/net/ssl/internal/ssl/ClientHandshaker/RSAExport.java

Changeset: da1eb844871c
Author:wetmore
Date:  2008-06-09 00:29 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/da1eb844871c

Merge


Changeset: e3de7e7bafcf
Author:weijun
Date:  2008-06-10 10:51 +0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/e3de7e7bafcf

6711509: PolicyTool is misspelling Runtime permission - 'setSecurityManager' 
entry in the policy file
Reviewed-by: wetmore, mullan

! src/share/classes/sun/security/tools/PolicyTool.java

Changeset: 2058f3daec43
Author:weijun
Date:  2008-06-10 11:03 +0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/2058f3daec43

6711435: console.sh uses incompatible ==
Reviewed-by: xuelei

! test/sun/security/tools/keytool/console.sh

Changeset: 93dce0e374de
Author:chegar
Date:  2008-06-12 17:25 +0100
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/93dce0e374de

6698625: InetAddress.getLocalHost() failed in returning chinese local host name
Summary: Remove unnecessary and incorrect NewStringUTF
Reviewed-by: michaelm

! src/solaris/native/java/net/Inet4AddressImpl.c
! src/solaris/native/java/net/Inet6AddressImpl.c
! src/windows/native/java/net/Inet4AddressImpl.c
! src/windows/native/java/net/Inet6AddressImpl.c

Changeset: 4d1d84792fd0
Author:chegar
Date:  2008-06-12 17:26 +0100
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/4d1d84792fd0

6630348: Invalid html tags (extra double quote)
Summary: Remove extra quote
Reviewed-by: michaelm

! src/share/classes/java/net/CookieHandler.java
! src/share/classes/java/net/ResponseCache.java
! src/share/classes/java/net/URI.java
! src/share/classes/java/net/URL.java

Changeset: 56993d795f7a
Author:chegar
Date:  2008-06-12 17:28 +0100
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/56993d795f7a

6628569: api/java_net/MulticastSocket/descriptions.html#setTTL fails is ipv6 
configured
Summary: failover to IPv6 socket if IPv4 fails
Reviewed-by: michaelm

! src/solaris/native/java/net/NetworkInterface.c

Changeset: 7c9d632e7323
Author:jccollet
Date:  2008-06-13 17:43 +0200
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/7c9d632e7323

6483406: new ServerSocket() sometimes takes more than 3 minutes on Suse Linux
Summary: Switch to socketpair() call to create marker fd
Reviewed-by: alanb

! src/solaris/native/java/net/PlainSocketImpl.c

Changeset: 6471947b1ffc
Author:wetmore
Date:  2008-06-16 10:46 -0700
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/6471947b1ffc

Merge