diff options
author | glewis <glewis@FreeBSD.org> | 2014-07-16 23:21:38 +0800 |
---|---|---|
committer | glewis <glewis@FreeBSD.org> | 2014-07-16 23:21:38 +0800 |
commit | 5ca802553b5aa3bfe990e9d64eeb4dcfc509fdad (patch) | |
tree | 8f81a94785cd31c7b4ba0409d828ee8bfceb354c /java | |
parent | 6b98d3fc32a705c7520c4ca26d4ce991b6351460 (diff) | |
download | freebsd-ports-gnome-5ca802553b5aa3bfe990e9d64eeb4dcfc509fdad.tar.gz freebsd-ports-gnome-5ca802553b5aa3bfe990e9d64eeb4dcfc509fdad.tar.zst freebsd-ports-gnome-5ca802553b5aa3bfe990e9d64eeb4dcfc509fdad.zip |
. Update to 7u65.
Diffstat (limited to 'java')
-rw-r--r-- | java/openjdk7/Makefile | 5 | ||||
-rw-r--r-- | java/openjdk7/files/patch-set | 11886 | ||||
-rw-r--r-- | java/openjdk7/files/patch-src-solaris-native-sun-nio-ch-NativeThread.c | 51 |
3 files changed, 9703 insertions, 2239 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 47685dbeedf7..90d981281b18 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -3,7 +3,6 @@ PORTNAME= openjdk PORTVERSION= ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} -PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \ @@ -36,8 +35,8 @@ DEBUG_DESC= Enable extra debugging info POLICY_DESC= Install the Unlimited Strength Policy Files TZUPDATE_DESC= Update the time zone data -PORT_MINOR_VERSION= 60 -PORT_BUILD_NUMBER= 19 +PORT_MINOR_VERSION= 65 +PORT_BUILD_NUMBER= 17 JDK_MAJOR_VERSION= 7 JDK_MINOR_VERSION= 40 JDK_BUILD_NUMBER= 43 diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set index 94f5403ab834..d4ea7196f4af 100644 --- a/java/openjdk7/files/patch-set +++ b/java/openjdk7/files/patch-set @@ -1,5 +1,5 @@ --- ./.hgtags 2013-09-06 11:20:33.000000000 -0700 -+++ ./.hgtags 2014-06-06 19:56:10.000000000 -0700 ++++ ./.hgtags 2014-07-15 23:25:11.000000000 -0700 @@ -123,6 +123,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 @@ -40,7 +40,7 @@ da376fd5e4d68f8a45003a6e175267dc840711cc jdk7u40-b32 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33 a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34 -@@ -341,3 +358,83 @@ +@@ -341,3 +358,104 @@ 3af81bfe320c12758234233da6fa27c3c0ffcdc4 jdk7u40-b42 1d53bd8fd2a62bcf336727ebec377ef7498dd4a6 jdk7u40-b43 dc1e099cd62d250b4a997ce694b47fe2f50d2905 jdk7u40-b60 @@ -92,6 +92,7 @@ +b829c5947c6cd473f42cadfe2c61399fb67c2da6 jdk7u55-b02 +a72b902cdd39d9f2f2d353d5ad629e543cbc01ae jdk7u55-b03 +6a8ee38075621564dd276e8ed7be576d637acf79 jdk7u55-b04 ++92ac508efb9e00d88b04a2bd79ab8a55f450a048 jdk7u65-b00 +92ac508efb9e00d88b04a2bd79ab8a55f450a048 jdk7u55-b05 +6c7cd2146f69cf0823765b3cf84c338c1dc7157c jdk7u55-b06 +5cad0f56c685a0673944dbc5632ea9ae7b9340c7 jdk7u55-b07 @@ -105,6 +106,8 @@ +0820b4707cfa75f8211b88b0daa67bba8475f498 jdk7u55-b30 +997ab3897d6ede80b0decdda94b569e57dd7dd90 jdk7u55-b14 +1f52edec29fd44c8bacce11ba7440287b37d04d1 jdk7u55-b31 ++5b15555172019b3c92484abff7c92f066e162d29 jdk7u55-b32 ++fa5ead8cb7d2de49cd138d93fb86fa5a10b07037 jdk7u55-b33 +11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00 +88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01 +6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02 @@ -122,10 +125,28 @@ +1ca6a368aec38ee91a41dc03899d7dc1037de44d jdk7u60-b14 +a95b821a2627295b90fb4ae8f3b8bc2ff9c64acc jdk7u60-b15 +19a3f6f48c541a8cf144eedffa0e52e108052e82 jdk7u60-b16 -+472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b18 +472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b17 ++472f5930e6cc8f307b5508995ee2edcf9913a852 jdk7u60-b18 ++b9264ea7e0887d511318bf7b53d12f944760bbbb jdk7u65-b01 ++2a7a5e774023944f291ee27ca5b3ad89e0e62aaf jdk7u60-b19 ++3a683f1730a148bcc1ca6eb9137116db427093f6 jdk7u65-b02 ++c154a8de7d34128ab75f46a2b6a909796f63b6e3 jdk7u65-b03 ++62e22dbc36410d76716bfa5e9fd679fcb4b1d845 jdk7u65-b04 ++4cab26e4e27f8ff382b8d6487224af59dc7c1fa1 jdk7u65-b05 ++b2cd3babc4ca1fb48b6073665e627f8bfb65d547 jdk7u65-b06 ++bc5e69657c0f6d58775ac7441033bbcbbaee3268 jdk7u65-b07 ++48eb3345e05fe904d2e92067da0abd04a9b375e4 jdk7u65-b08 ++2e7881991d5294061023f8862b702e4730f2860d jdk7u65-b09 ++db03cbff389500c7ccfd4b476ab78319f6e24d2d jdk7u65-b10 ++9f629f70ec6c4249baadaadd05b0f32c9129ad05 jdk7u65-b11 ++71cd7866ca68b333e36330e179ab1d69d721aaee jdk7u65-b12 ++49dbfea9d3a4b709f3230d581a09d960c2de5109 jdk7u65-b13 ++0cfadcb9f8006ac5601bb0ce8b74211d6b223c11 jdk7u65-b14 ++3cce3737be368dc3d304508cd0d6e354f8a19f55 jdk7u65-b15 ++2c8b05ed9802cf4e5f61439a6d6286e7f7cd444e jdk7u65-b16 ++927d8d3db13c5221237b51efe45206054ee6e3f3 jdk7u65-b17 --- ./Makefile 2013-09-06 11:20:33.000000000 -0700 -+++ ./Makefile 2013-12-01 11:13:37.000000000 -0800 ++++ ./Makefile 2014-07-15 23:25:11.000000000 -0700 @@ -264,7 +264,7 @@ DEBUG_NAME=$(DEBUG_NAME) \ GENERATE_DOCS=false \ @@ -136,7 +157,7 @@ generic_build_repo_series --- ./corba/.hgtags 2013-09-06 11:20:46.000000000 -0700 -+++ ./corba/.hgtags 2014-06-06 19:56:11.000000000 -0700 ++++ ./corba/.hgtags 2014-07-15 23:25:10.000000000 -0700 @@ -123,6 +123,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 @@ -168,7 +189,7 @@ ef8e6f8305d524f3b448a85f901aadf1adc81fc0 jdk7u25-b12 eca480919c71072a31f62a61cb3aad30677007e3 jdk7u25-b13 577c4dd1a6e9bc1bb2c2e5d5ecbab8eacb4121af jdk7u25-b14 -@@ -343,3 +360,83 @@ +@@ -343,3 +360,104 @@ b4a480a039bc19b27bfb5fcbbbf75e651d2718b7 jdk7u40-b42 e29ea0b297e519010e661603a07bb8d48fa904a2 jdk7u40-b43 08737d863a7aa5eb39374b26c9585e1770affe92 jdk7u40-b60 @@ -220,6 +241,7 @@ +db2e6d87bade9d2061646ff9a6b39b5159fba0ec jdk7u55-b02 +02ff18f156bd3382fe22e4758b138370f5238e97 jdk7u55-b03 +6a88a170331fb38af5046e54bf75f38176af5c41 jdk7u55-b04 ++a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u65-b00 +a8d27c3fc4e4e6cd99fa164f04c30a71f474a2d6 jdk7u55-b05 +af7f1808106bf4e9b4680d943677299829245d08 jdk7u55-b06 +44801796d42bebc90e8c4c7fb5bd79db04b10b75 jdk7u55-b07 @@ -233,6 +255,8 @@ +e041c52fe69128ec3439d26afef9b0fcba00684c jdk7u55-b30 +a0bfd0e80ae0ae6e3a29bf527b5911c83163b3f5 jdk7u55-b14 +55ff6957449cf6c79f5d5bb159df27f51ece1659 jdk7u55-b31 ++fba15e177b15873e3c63b0efc7c0f5647a243a79 jdk7u55-b32 ++6503115cbedda9216083fc1798e2fa5a2775f68a jdk7u55-b33 +c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00 +a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01 +d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02 @@ -250,10 +274,28 @@ +02bdeb33754315f589bd650dde656d2c9947976d jdk7u60-b14 +e5946b2cf82bdea3a4b85917e903168e65a543a7 jdk7u60-b15 +e424fb8452851b56db202488a4e9a283934c4887 jdk7u60-b16 -+b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b18 +b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b17 ++b96d90694be873372cc417b38b01afed6ac1b239 jdk7u60-b18 ++550ae238459e0f59d9a85d183bc2b4520adac05b jdk7u65-b01 ++5d1b39fe68944cff6380db56fbe2fbaa28091bf6 jdk7u60-b19 ++6a89d959cbade46fcd281f421ac40a804d098f0b jdk7u65-b02 ++afed3d62e8051fe65f431abe87dad50cbeba3800 jdk7u65-b03 ++38fabf72970ae509350f57ffad99f6ac8fc6fdad jdk7u65-b04 ++12c1621ce88defa65ebc1bdffb7141bd7d0089a6 jdk7u65-b05 ++5041c713522c0fc68239fc91f7fb9498dd7edebb jdk7u65-b06 ++144887a766dc17a139524dd43f1a0bc8f2a2a3a2 jdk7u65-b07 ++5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u65-b08 ++1f7156e0a46129dbaf5b248802371564d92630a3 jdk7u65-b09 ++be3cbbea3ec1e14b6492acbbd5c08222c24a5061 jdk7u65-b10 ++fd7e4972cfefa174ce3d6dcb7f4b409df11a745b jdk7u65-b11 ++792ef0370bf7bcf83c9404d2b44f08722dcd73aa jdk7u65-b12 ++b95f46ae5207853a89d52b0453a2fb99fffee817 jdk7u65-b13 ++6efadedfe3295dbf2af4a350d813524af029b116 jdk7u65-b14 ++78966cf34d868ef18b8a3fa7edec368e1cc4739d jdk7u65-b15 ++d765ed30bd5ed2bdd71fda56c056333e1b4b0d7d jdk7u65-b16 ++cd642d59aca29ff2b56e7ed016be758828f199cd jdk7u65-b17 --- ./corba/make/Makefile 2013-09-06 11:20:46.000000000 -0700 -+++ ./corba/make/Makefile 2014-01-18 12:16:05.000000000 -0800 ++++ ./corba/make/Makefile 2014-07-15 23:25:08.000000000 -0700 @@ -160,7 +160,7 @@ # # CORBA @@ -1233,7 +1275,7 @@ - } -} --- ./corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2013-09-06 11:20:47.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -82,11 +82,18 @@ super((ORB)orb); } @@ -1259,7 +1301,7 @@ } --- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsInputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved. @@ -1290,7 +1332,7 @@ protected CodeSetConversion.BTCConverter createCharBTCConverter() { --- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/EncapsOutputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved. @@ -1325,7 +1367,7 @@ protected CodeSetConversion.CTBConverter createCharCTBConverter() { --- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeInputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved. @@ -1361,7 +1403,7 @@ encap.setEnclosingInputStream(is); encap.makeEncapsulation(); --- ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -61,6 +61,8 @@ import java.math.BigInteger; import java.nio.ByteBuffer; @@ -1385,7 +1427,7 @@ //System.out.println("Created TypeCodeInputStream " + tcis + " with no parent"); //tcis.printBuffer(); --- ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java 2014-07-15 23:25:08.000000000 -0700 @@ -33,6 +33,8 @@ import com.sun.corba.se.spi.ior.iiop.GIOPVersion; import com.sun.corba.se.spi.logging.CORBALogDomains; @@ -1575,7 +1617,7 @@ - -} --- ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2011, Oracle and/or its affiliates. All rights reserved. @@ -1638,7 +1680,7 @@ com.sun.org.omg.SendingContext.CodeBase sender, int offset) --- ./corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java 2014-07-15 23:25:08.000000000 -0700 @@ -201,7 +201,7 @@ readObjectState.endDefaultReadObject(this); } @@ -1649,7 +1691,7 @@ abstract void readFields(java.util.Map fieldToValueMap) throws java.io.InvalidClassException, java.io.StreamCorruptedException, --- ./corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2014-04-19 01:27:00.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/io/ObjectStreamClass.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. @@ -2037,7 +2079,7 @@ return ((pkg1 == pkg2) || ((pkg1 != null) && (pkg1.equals(pkg2)))); } --- ./corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. @@ -2066,7 +2108,7 @@ return result ; } --- ./corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyFactoryImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. @@ -2093,7 +2135,7 @@ ObjectKeyTemplate oktemp = create( is, fullKey, osh ) ; if (oktemp == null) --- ./corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2013-09-06 11:20:48.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -70,6 +70,8 @@ import com.sun.corba.se.impl.encoding.EncapsInputStream ; import com.sun.corba.se.impl.encoding.EncapsOutputStream ; @@ -2238,7 +2280,7 @@ - } -} --- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java 2013-09-06 11:20:49.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java 2014-04-19 01:27:00.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClassUtil_1_3.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2002, Oracle and/or its affiliates. All rights reserved. @@ -2285,7 +2327,7 @@ classWithThisMethod = java.io.ObjectStreamClass.class; --- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2013-09-06 11:20:49.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2014-04-19 01:27:00.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/ObjectStreamClass_1_3_1.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. @@ -2532,7 +2574,7 @@ } } --- ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties 2013-09-06 11:20:49.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties 2014-06-06 19:56:11.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties 2014-07-15 23:25:08.000000000 -0700 @@ -23,7 +23,7 @@ # questions. # @@ -2543,7 +2585,7 @@ servertool.usage=Uso: {0} <op\u00E7\u00F5es> \n\nem que <op\u00E7\u00F5es> inclui:\n -ORBInitialPort porta inicial (obrigat\u00F3rio)\n -ORBInitialHost nome de host inicial (obrigat\u00F3rio)\n servertool.banner=\n\nBem-vindo \u00E0 Ferramenta de Servidor IDL Java \ninsira os comandos no prompt \n --- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-09-06 11:20:49.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2013-12-01 11:13:38.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/IDLNameTranslatorImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -905,28 +905,4 @@ return contents.toString(); @@ -4009,7 +4051,7 @@ - -} --- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2013-12-01 11:13:38.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/InvocationHandlerFactoryImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -43,6 +43,8 @@ import com.sun.corba.se.spi.orbutil.proxy.DelegateInvocationHandlerImpl ; import com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandler ; @@ -4055,7 +4097,7 @@ // If the method passed to invoke is not from DynamicStub or its superclasses, // it must be from an implemented interface, so we just handle --- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryDynamicBase.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. @@ -4107,7 +4149,7 @@ public abstract org.omg.CORBA.Object makeStub() ; } --- ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/presentation/rmi/StubFactoryFactoryProxyImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. @@ -4143,7 +4185,7 @@ } } --- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. @@ -4171,7 +4213,7 @@ String msg = --- ./corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/protocol/SharedCDRClientRequestDispatcherImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. @@ -4953,7 +4995,7 @@ - private IOR ior; // forwarded IOR -} --- ./corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2009, Oracle and/or its affiliates. All rights reserved. @@ -5695,7 +5737,7 @@ - -// End of file. --- ./corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java 2014-06-06 19:56:11.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/DefaultSocketFactoryImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -32,6 +32,7 @@ import java.net.ServerSocket; import java.nio.channels.SocketChannel; @@ -5747,7 +5789,7 @@ } --- ./corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2013-09-06 11:20:50.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2013-12-01 11:13:38.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. @@ -5765,7 +5807,7 @@ Thread implements --- ./corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2013-09-06 11:20:51.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2014-04-19 01:27:00.000000000 -0700 ++++ ./corba/src/share/classes/com/sun/corba/se/spi/orb/ORB.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -5818,7 +5860,7 @@ /** Get the appropriate StubFactoryFactory. This --- ./corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2013-09-06 11:20:51.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java 2014-07-15 23:25:08.000000000 -0700 @@ -36,6 +36,7 @@ import com.sun.corba.se.spi.logging.CORBALogDomains ; @@ -5857,7 +5899,7 @@ + private static final long serialVersionUID = 4571178305984833743L; } --- ./corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java 2013-09-06 11:20:52.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/corba/se/spi/servicecontext/ServiceContexts.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2004, Oracle and/or its affiliates. All rights reserved. @@ -5893,7 +5935,7 @@ // Now the input stream passed to a ServiceContext --- ./corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2013-09-06 11:20:53.000000000 -0700 -+++ ./corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/com/sun/tools/corba/se/idl/idl_ja.prp 2014-07-15 23:25:08.000000000 -0700 @@ -110,7 +110,7 @@ ParseException.badCustom=%0 (\u884C%1): forward\u5024\u5BA3\u8A00\u306Fcustom\u3068\u3057\u3066\u5BA3\u8A00\u3067\u304D\u307E\u305B\u3093\u3002\n%2\n%3 ParseException.badRepIDAlreadyAssigned=%0 (\u884C%1): \u578B%2\u306B\u306F\u3001\u524D\u306EID\u30D7\u30E9\u30B0\u30DE\u30FB\u30C7\u30A3\u30EC\u30AF\u30C6\u30A3\u30D6\u306E\u30EA\u30DD\u30B8\u30C8\u30EAID\u304C\u3059\u3067\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4 @@ -5904,7 +5946,7 @@ ParseException.branchLabel=%0 (\u884C%1): case %2\u306F\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4 ParseException.branchName=%0 (\u884C%1): %2\u3068\u3044\u3046\u540D\u524D\u306E\u5206\u5C90\u306F\u3059\u3067\u306B\u5BA3\u8A00\u3055\u308C\u3066\u3044\u307E\u3059\u3002\n%3\n%4 --- ./corba/src/share/classes/javax/rmi/CORBA/Stub.java 2013-09-06 11:20:53.000000000 -0700 -+++ ./corba/src/share/classes/javax/rmi/CORBA/Stub.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/javax/rmi/CORBA/Stub.java 2014-07-15 23:25:08.000000000 -0700 @@ -61,13 +61,11 @@ private transient StubDelegate stubDelegate = null; private static Class stubDelegateClass = null; @@ -5939,7 +5981,7 @@ try { --- ./corba/src/share/classes/javax/rmi/CORBA/Util.java 2013-09-06 11:20:53.000000000 -0700 -+++ ./corba/src/share/classes/javax/rmi/CORBA/Util.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/javax/rmi/CORBA/Util.java 2014-07-15 23:25:08.000000000 -0700 @@ -60,14 +60,11 @@ public class Util { @@ -5978,7 +6020,7 @@ try { --- ./corba/src/share/classes/javax/rmi/PortableRemoteObject.java 2013-09-06 11:20:53.000000000 -0700 -+++ ./corba/src/share/classes/javax/rmi/PortableRemoteObject.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/javax/rmi/PortableRemoteObject.java 2014-07-15 23:25:08.000000000 -0700 @@ -65,17 +65,14 @@ */ public class PortableRemoteObject { @@ -6018,7 +6060,7 @@ try { --- ./corba/src/share/classes/org/omg/CORBA/ORB.java 2013-09-06 11:20:54.000000000 -0700 -+++ ./corba/src/share/classes/org/omg/CORBA/ORB.java 2014-04-19 01:27:00.000000000 -0700 ++++ ./corba/src/share/classes/org/omg/CORBA/ORB.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. @@ -6051,7 +6093,7 @@ // The global instance of the singleton ORB implementation which // acts as a factory for typecodes for generated Helper classes. // TypeCodes should be immutable since they may be shared across -@@ -294,22 +287,42 @@ +@@ -294,22 +287,26 @@ String className = getSystemProperty(ORBSingletonClassKey); if (className == null) className = getPropertyFromFile(ORBSingletonClassKey); @@ -6063,30 +6105,14 @@ + (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) { + singleton = new com.sun.corba.se.impl.orb.ORBSingleton(); + } else { -+ singleton = create_impl_with_systemclassloader(className); ++ singleton = create_impl(className); + } } return singleton; } -- private static ORB create_impl(String className) { -+ private static ORB create_impl_with_systemclassloader(String className) { - -+ try { -+ ReflectUtil.checkPackageAccess(className); -+ ClassLoader cl = ClassLoader.getSystemClassLoader(); -+ Class<org.omg.CORBA.ORB> orbBaseClass = org.omg.CORBA.ORB.class; -+ Class<?> singletonOrbClass = Class.forName(className, true, cl).asSubclass(orbBaseClass); -+ return (ORB)singletonOrbClass.newInstance(); -+ } catch (Throwable ex) { -+ SystemException systemException = new INITIALIZE( -+ "can't instantiate default ORB implementation " + className); -+ systemException.initCause(ex); -+ throw systemException; -+ } -+ } -+ -+ private static ORB create_impl(String className) { + private static ORB create_impl(String className) { +- ClassLoader cl = Thread.currentThread().getContextClassLoader(); if (cl == null) cl = ClassLoader.getSystemClassLoader(); @@ -6100,7 +6126,7 @@ } catch (Throwable ex) { SystemException systemException = new INITIALIZE( "can't instantiate default ORB implementation " + className); -@@ -347,10 +360,12 @@ +@@ -347,10 +344,12 @@ className = getSystemProperty(ORBClassKey); if (className == null) className = getPropertyFromFile(ORBClassKey); @@ -6117,7 +6143,7 @@ orb.set_parameters(args, props); return orb; } -@@ -375,10 +390,12 @@ +@@ -375,10 +374,12 @@ className = getSystemProperty(ORBClassKey); if (className == null) className = getPropertyFromFile(ORBClassKey); @@ -6134,7 +6160,7 @@ orb.set_parameters(app, props); return orb; } -@@ -574,7 +591,7 @@ +@@ -574,7 +575,7 @@ try { // First try to load the OperationDef class String opDefClassName = "org.omg.CORBA.OperationDef"; @@ -6143,7 +6169,7 @@ ClassLoader cl = Thread.currentThread().getContextClassLoader(); if ( cl == null ) -@@ -584,7 +601,7 @@ +@@ -584,7 +585,7 @@ // OK, we loaded OperationDef. Now try to get the // create_operation_list(OperationDef oper) method. @@ -6153,7 +6179,7 @@ this.getClass().getMethod("create_operation_list", argc); --- ./corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java 2013-09-06 11:20:55.000000000 -0700 -+++ ./corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/org/omg/CORBA_2_3/portable/InputStream.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2000, Oracle and/or its affiliates. All rights reserved. @@ -6217,7 +6243,7 @@ * Unmarshalls a value type from the input stream. * @return the value type unmarshalled from the input stream --- ./corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java 2014-01-18 12:16:06.000000000 -0800 ++++ ./corba/src/share/classes/sun/corba/EncapsInputStreamFactory.java 2014-07-15 23:25:08.000000000 -0700 @@ -0,0 +1,153 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -6373,7 +6399,7 @@ + } +} --- ./corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2013-09-06 11:20:56.000000000 -0700 -+++ ./corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2013-12-01 11:13:38.000000000 -0800 ++++ ./corba/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java 2014-07-15 23:25:08.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. @@ -6526,7 +6552,7 @@ p.pln("(" + idExtInputStream + ") "+_in+";"); p.pO(); --- ./hotspot/.hgtags 2013-09-06 11:21:49.000000000 -0700 -+++ ./hotspot/.hgtags 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/.hgtags 2014-07-15 23:24:59.000000000 -0700 @@ -182,6 +182,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 @@ -6560,7 +6586,7 @@ e3d2c238e29c421c3b5c001e400acbfb30790cfc jdk7u14-b14 860ae068f4dff62a77c8315f0335b7e935087e86 hs24-b34 12619005c5e29be6e65f0dc9891ca19d9ffb1aaa jdk7u14-b15 -@@ -550,3 +569,92 @@ +@@ -550,3 +569,113 @@ b8d8caf6df744d5342b5d284376a005e86c0b108 hs24-b56 eceae04782438987cd747e1c76e4085f50b43a18 jdk7u40-b43 af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60 @@ -6612,6 +6638,7 @@ +408028d410e316a99495c42df0031018890c22fe jdk7u55-b02 +50fb91504dd8cdf410eb956075442daf3aacf1db jdk7u55-b03 +3be3b8a032a5508646c1c5620cee18d3e69fc708 jdk7u55-b04 ++b86119fa2748bd91ae4984ff2264da92b6626f8c jdk7u65-b00 +b86119fa2748bd91ae4984ff2264da92b6626f8c jdk7u55-b05 +260d919d52e500a0b20f911fade2a7710474067a jdk7u55-b06 +8cf6e0a3a0651c4132ae034c2b68ddf4eb5c4d88 jdk7u55-b07 @@ -6625,6 +6652,8 @@ +d27b468d5f3be3329ff1ff342f3347e6b2e0303b jdk7u55-b30 +dff9147a781672f20bb0577a94233264ea4a95d1 jdk7u55-b14 +8175599864880938d68d0a515fa561043d7d5fd0 jdk7u55-b31 ++ba9270b8fb1f4852ff1d9dab15571eb9e0714495 jdk7u55-b32 ++0901a8cf66a0494b55bf104c9666d4e3c6ff93f0 jdk7u55-b33 +ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00 +af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60 +cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01 @@ -6651,10 +6680,28 @@ +b226be2040f971855626f5b88cb41a7d5299fea0 jdk7u60-b14 +2871f345b7e5585e20dc7aa91035967fe774cfba jdk7u60-b15 +ec76bacbb5b90efc7988dee5345c656126b97561 jdk7u60-b16 -+617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b18 +617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b17 ++617a6338e0c4f7699eed5061d7e8f576c3ace029 jdk7u60-b18 ++4a9635c98a917cfcef506ca5d034c733a33c53f3 jdk7u65-b01 ++361493c7cdb5f75b28efc63389d6cebaaaa43a2c jdk7u60-b19 ++eb797fab50d3b440b17b3e7c5d83f42bfa73655e jdk7u65-b02 ++bb00df28ecdbd0da89ab4ed81f6f2b732fa512da jdk7u65-b03 ++848481af9003067546c7f34c166bb8d745b95d5f jdk7u65-b04 ++98a884fa64a9ef1753a28691106efe10942b9d70 jdk7u65-b05 ++6f1dddf9c632bfb14121c9521d17b64bd0be0cd2 jdk7u65-b06 ++a053d3d805355ffcd85c17e653182e17d4456bd5 jdk7u65-b07 ++6f03dfb50363d26599fcf726586ea3f6d0e0347d jdk7u65-b08 ++b4930eb1ea7630b4d8609e2efe6f000d3dc83235 jdk7u65-b09 ++4736382ac9d999044b05eb26932ab6fc59dbb159 jdk7u65-b10 ++7345c7bf20fd8c91492240a95082af9a201b3a96 jdk7u65-b11 ++28b81694b89f88541e28bbc767d78e77ec66cce6 jdk7u65-b12 ++f4ed018b4c51dae699da835617b19e8a49c124a4 jdk7u65-b13 ++7ec585caae47f7202fb5357607f9ad058b03870e jdk7u65-b14 ++7058f0d30de6826b6866ce2d146c63e943be33af jdk7u65-b15 ++f1b2970a2564c3360db420431cfbba215da6ae43 jdk7u65-b16 ++4c6df9a369cb9d54fe2d898452883a22b8ec6640 jdk7u65-b17 --- ./hotspot/agent/src/os/bsd/ps_proc.c 2013-09-06 11:21:50.000000000 -0700 -+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/agent/src/os/bsd/ps_proc.c 2014-07-15 23:24:51.000000000 -0700 @@ -131,7 +131,7 @@ static bool ptrace_continue(pid_t pid, int signal) { @@ -6665,7 +6712,7 @@ return false; } --- ./hotspot/agent/src/os/linux/ps_core.c 2013-09-06 11:21:50.000000000 -0700 -+++ ./hotspot/agent/src/os/linux/ps_core.c 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/agent/src/os/linux/ps_core.c 2014-07-15 23:24:51.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -6754,7 +6801,7 @@ // process segments from interpreter (ld.so or ld-linux.so) --- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2013-09-06 11:21:51.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2014-07-15 23:24:52.000000000 -0700 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.*; import sun.jvm.hotspot.debugger.windbg.*; @@ -6764,7 +6811,7 @@ import sun.jvm.hotspot.oops.*; import sun.jvm.hotspot.runtime.*; --- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2013-09-06 11:21:52.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2014-07-15 23:24:52.000000000 -0700 @@ -35,6 +35,7 @@ import sun.jvm.hotspot.debugger.windbg.*; import sun.jvm.hotspot.debugger.linux.*; @@ -6774,7 +6821,7 @@ import sun.jvm.hotspot.livejvm.*; import sun.jvm.hotspot.memory.*; --- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java 2013-09-06 11:21:55.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/interpreter/Bytecodes.java 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. @@ -6806,7 +6853,7 @@ def(_fast_aldc_w , "fast_aldc_w" , "bJJ" , null , BasicType.getTObject(), 1, true, _ldc_w ); --- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java 2013-09-06 11:21:56.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/JVMTIThreadState.java 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. @@ -6828,7 +6875,7 @@ public static final int JVMTI_THREAD_STATE_PARKED = 0x0200; public static final int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400; --- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java 2013-09-06 11:21:57.000000000 -0700 -+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/OSThread.java 2014-07-15 23:24:52.000000000 -0700 @@ -32,7 +32,7 @@ // to the sys_thread_t structure of the classic JVM implementation. public class OSThread extends VMObject { @@ -6857,7 +6904,7 @@ } --- ./hotspot/make/bsd/Makefile 2013-09-06 11:21:59.000000000 -0700 -+++ ./hotspot/make/bsd/Makefile 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/Makefile 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -6888,7 +6935,7 @@ # Synonyms for win32-like targets. compiler2: jvmg product --- ./hotspot/make/bsd/makefiles/arm.make 2013-09-06 11:21:59.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/arm.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/arm.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. @@ -6907,7 +6954,7 @@ CFLAGS += -DVM_LITTLE_ENDIAN --- ./hotspot/make/bsd/makefiles/build_vm_def.sh 2013-09-06 11:21:59.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/build_vm_def.sh 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/build_vm_def.sh 2014-07-15 23:24:52.000000000 -0700 @@ -7,6 +7,16 @@ NM=nm fi @@ -6926,7 +6973,7 @@ ' +fi --- ./hotspot/make/bsd/makefiles/buildtree.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/buildtree.make 2014-06-06 19:57:03.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/buildtree.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. @@ -6978,7 +7025,7 @@ .dbxrc: $(BUILDTREE_MAKE) @echo Creating $@ ... --- ./hotspot/make/bsd/makefiles/gcc.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/gcc.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/gcc.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7025,7 +7072,7 @@ # -DDONT_USE_PRECOMPILED_HEADER will exclude all includes in precompiled.hpp. --- ./hotspot/make/bsd/makefiles/jsig.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/jsig.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/jsig.make 2014-07-15 23:24:52.000000000 -0700 @@ -36,9 +36,16 @@ LIBJSIG_G = lib$(JSIG_G).so endif @@ -7079,7 +7126,7 @@ .PHONY: install_jsig --- ./hotspot/make/bsd/makefiles/launcher.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/launcher.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/launcher.make 2014-07-15 23:24:52.000000000 -0700 @@ -50,7 +50,7 @@ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) else @@ -7090,7 +7137,7 @@ # The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a # freshly built JVM at ./libjvm.{so|dylib}. This is accomplished by setting --- ./hotspot/make/bsd/makefiles/mapfile-vers-product 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/mapfile-vers-product 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/mapfile-vers-product 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7570,7 +7617,7 @@ +}; --- ./hotspot/make/bsd/makefiles/ppc.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/ppc.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/ppc.make 2014-07-15 23:24:52.000000000 -0700 @@ -28,3 +28,6 @@ # Must also specify if CPU is big endian CFLAGS += -DVM_BIG_ENDIAN @@ -7579,7 +7626,7 @@ +ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 +endif --- ./hotspot/make/bsd/makefiles/saproc.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/saproc.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/saproc.make 2014-07-15 23:24:52.000000000 -0700 @@ -36,6 +36,11 @@ LIBSAPROC_G = lib$(SAPROC_G).so endif @@ -7637,7 +7684,7 @@ fi --- ./hotspot/make/bsd/makefiles/vm.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/bsd/makefiles/vm.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/bsd/makefiles/vm.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. @@ -7670,7 +7717,7 @@ LFLAGS_VM += $(LLVM_LDFLAGS) endif --- ./hotspot/make/hotspot_version 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/hotspot_version 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/make/hotspot_version 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. @@ -7688,13 +7735,13 @@ HS_MAJOR_VER=24 -HS_MINOR_VER=0 -HS_BUILD_NUMBER=56 -+HS_MINOR_VER=60 -+HS_BUILD_NUMBER=09 ++HS_MINOR_VER=65 ++HS_BUILD_NUMBER=04 JDK_MAJOR_VER=1 JDK_MINOR_VER=7 --- ./hotspot/make/linux/makefiles/arm.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/linux/makefiles/arm.make 2014-04-19 01:27:07.000000000 -0700 ++++ ./hotspot/make/linux/makefiles/arm.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. @@ -7713,7 +7760,7 @@ CFLAGS += -DVM_LITTLE_ENDIAN --- ./hotspot/make/linux/makefiles/buildtree.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/linux/makefiles/buildtree.make 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/make/linux/makefiles/buildtree.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. @@ -7739,7 +7786,7 @@ echo "# Used for platform dispatching"; \ echo "TARGET_DEFINES = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \ --- ./hotspot/make/linux/makefiles/gcc.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/linux/makefiles/gcc.make 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/make/linux/makefiles/gcc.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. @@ -7761,7 +7808,7 @@ CFLAGS += $(LLVM_CFLAGS) endif --- ./hotspot/make/linux/makefiles/vm.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/linux/makefiles/vm.make 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/make/linux/makefiles/vm.make 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,6 @@ # # Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. @@ -7803,7 +7850,7 @@ LFLAGS_VM += $(LLVM_LDFLAGS) endif --- ./hotspot/make/solaris/makefiles/defs.make 2013-09-06 11:22:00.000000000 -0700 -+++ ./hotspot/make/solaris/makefiles/defs.make 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/make/solaris/makefiles/defs.make 2014-07-15 23:24:52.000000000 -0700 @@ -221,8 +221,8 @@ endif ifeq ($(JVM_VARIANT_CLIENT),true) @@ -7816,7 +7863,7 @@ ifeq ($(ARCH_DATA_MODEL),32) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) --- ./hotspot/make/windows/makefiles/compile.make 2013-09-06 11:22:01.000000000 -0700 -+++ ./hotspot/make/windows/makefiles/compile.make 2013-12-01 11:14:01.000000000 -0800 ++++ ./hotspot/make/windows/makefiles/compile.make 2014-07-15 23:24:52.000000000 -0700 @@ -172,6 +172,7 @@ PRODUCT_OPT_OPTION = /O2 /Oy- FASTDEBUG_OPT_OPTION = /O2 /Oy- @@ -7856,7 +7903,7 @@ # If NO_OPTIMIZATIONS is defined in the environment, turn everything off --- ./hotspot/make/windows/makefiles/sa.make 2013-09-06 11:22:01.000000000 -0700 -+++ ./hotspot/make/windows/makefiles/sa.make 2013-12-01 11:14:01.000000000 -0800 ++++ ./hotspot/make/windows/makefiles/sa.make 2014-07-15 23:24:52.000000000 -0700 @@ -107,6 +107,9 @@ !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" SA_LFLAGS = $(SA_LFLAGS) -map -debug @@ -7868,7 +7915,7 @@ # Note that we do not keep sawindbj.obj around as it would then # get included in the dumpbin command in build_vm_def.sh --- ./hotspot/src/cpu/sparc/vm/assembler_sparc.cpp 2013-09-06 11:22:01.000000000 -0700 -+++ ./hotspot/src/cpu/sparc/vm/assembler_sparc.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/assembler_sparc.cpp 2014-07-15 23:24:52.000000000 -0700 @@ -4512,7 +4512,7 @@ #define __ masm. address start = __ pc(); @@ -7895,7 +7942,7 @@ // Use return-from-leaf __ retl(); --- ./hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp 2013-09-06 11:22:01.000000000 -0700 -+++ ./hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp 2014-07-15 23:24:52.000000000 -0700 @@ -36,6 +36,9 @@ #include "runtime/signature.hpp" #include "runtime/vframeArray.hpp" @@ -7932,7 +7979,7 @@ // Use return-from-leaf __ retl(); --- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2014-07-15 23:24:52.000000000 -0700 @@ -71,7 +71,11 @@ define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); @@ -7946,7 +7993,7 @@ // GC Ergo Flags define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread --- ./hotspot/src/cpu/sparc/vm/sparc.ad 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/sparc/vm/sparc.ad 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/sparc.ad 2014-07-15 23:24:52.000000000 -0700 @@ -3399,8 +3399,8 @@ interface(CONST_INTER); %} @@ -8029,7 +8076,7 @@ size(4); --- ./hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/sparc/vm/templateInterpreter_sparc.cpp 2014-07-15 23:24:52.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -8064,7 +8111,7 @@ __ dispatch_next(vtos); // end of JVMTI PopFrame support --- ./hotspot/src/cpu/x86/vm/assembler_x86.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/assembler_x86.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/assembler_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -8754,13 +8754,18 @@ const Register card_addr = tmp; lea(card_addr, as_Address(ArrayAddress(cardtable, index))); @@ -8087,7 +8134,7 @@ cmpl(queue_index, 0); jcc(Assembler::equal, runtime); --- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1686,14 +1686,6 @@ } @@ -8119,7 +8166,7 @@ if (op->fast_check()) { --- ./hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/c1_LIRGenerator_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1395,19 +1395,18 @@ addr = new LIR_Address(src.result(), offset, type); } @@ -8146,7 +8193,7 @@ // Seems to be a precise address post_barrier(LIR_OprFact::address(addr), data); --- ./hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -37,6 +37,9 @@ #include "runtime/signature.hpp" #include "runtime/vframeArray.hpp" @@ -8178,7 +8225,7 @@ __ cmpl(queue_index, 0); __ jcc(Assembler::equal, runtime); --- ./hotspot/src/cpu/x86/vm/frame_x86.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/frame_x86.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/frame_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -94,12 +94,6 @@ // other generic buffer blobs are more problematic so we just assume they are // ok. adapter blobs never have a frame complete and are never ok. @@ -8205,7 +8252,7 @@ // On Intel the return_address is always the word on the stack sender_pc = (address) *(sender_sp-1); --- ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -62,7 +62,7 @@ // due to lack of optimization caused by C++ compiler bugs define_pd_global(intx, StackShadowPages, NOT_WIN64(20) WIN64_ONLY(6) DEBUG_ONLY(+2)); @@ -8216,7 +8263,7 @@ define_pd_global(intx, PreInflateSpin, 10); --- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_32.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -8253,7 +8300,7 @@ // end of PopFrame support --- ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp 2013-09-06 11:22:02.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/templateInterpreter_x86_64.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. @@ -8290,7 +8337,7 @@ // end of PopFrame support --- ./hotspot/src/cpu/x86/vm/x86_32.ad 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/x86_32.ad 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/x86_32.ad 2014-07-15 23:24:53.000000000 -0700 @@ -3919,6 +3919,17 @@ interface(CONST_INTER); %} @@ -8326,7 +8373,7 @@ "AND $dst.lo,$mask" %} ins_encode %{ --- ./hotspot/src/cpu/x86/vm/x86_64.ad 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/cpu/x86/vm/x86_64.ad 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/x86/vm/x86_64.ad 2014-07-15 23:24:52.000000000 -0700 @@ -3142,6 +3142,17 @@ interface(CONST_INTER); %} @@ -8362,7 +8409,7 @@ ins_encode %{ Register Rdst = $dst$$Register; --- ./hotspot/src/cpu/zero/vm/entryFrame_zero.hpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/cpu/zero/vm/entryFrame_zero.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/zero/vm/entryFrame_zero.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,6 +1,6 @@ /* * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -8383,7 +8430,7 @@ public: --- ./hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,6 +1,6 @@ /* * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. @@ -8402,7 +8449,7 @@ } --- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -460,14 +460,14 @@ void AttachListener::vm_start() { @@ -8421,7 +8468,7 @@ ret = ::unlink(fn); if (ret == -1) { --- ./hotspot/src/os/bsd/vm/decoder_bsd.cpp 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/decoder_bsd.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -8470,7 +8517,14 @@ +} + --- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2014-07-15 23:24:53.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1999, 2014, 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 @@ -187,6 +187,8 @@ static int SR_signum = SIGUSR2; sigset_t SR_sigset; @@ -8559,7 +8613,17 @@ double os::elapsedVTime() { // better than nothing, but not much return elapsedTime(); -@@ -1830,7 +1850,7 @@ +@@ -1807,9 +1827,6 @@ + ::abort(); + } + +-// unused on bsd for now. +-void os::set_error_file(const char *logfile) {} +- + + // This method is a copy of JDK's sysGetLastErrorString + // from src/solaris/hpi/src/system_md.c +@@ -1830,7 +1847,7 @@ intx os::current_thread_id() { #ifdef __APPLE__ @@ -8568,7 +8632,7 @@ #else return (intx)::pthread_self(); #endif -@@ -2381,14 +2401,14 @@ +@@ -2381,14 +2398,14 @@ } void os::print_os_info_brief(outputStream* st) { @@ -8585,7 +8649,7 @@ os::Posix::print_uname_info(st); -@@ -2397,10 +2417,6 @@ +@@ -2397,10 +2414,6 @@ os::Posix::print_load_average(st); } @@ -8596,7 +8660,7 @@ void os::print_memory_info(outputStream* st) { st->print("Memory:"); -@@ -2417,6 +2433,7 @@ +@@ -2417,6 +2430,7 @@ st->print("(" UINT64_FORMAT "k free)", os::available_memory() >> 10); #ifndef _ALLBSD_SOURCE @@ -8604,7 +8668,7 @@ st->print(", swap " UINT64_FORMAT "k", ((jlong)si.totalswap * si.mem_unit) >> 10); st->print("(" UINT64_FORMAT "k free)", -@@ -2424,12 +2441,22 @@ +@@ -2424,12 +2438,22 @@ #endif st->cr(); @@ -8627,8 +8691,11 @@ // Taken from /usr/include/bits/siginfo.h Supposed to be architecture specific // but they're the same for all the bsd arch that we support // and they're the same for solaris but there's no common place to put this. -@@ -2575,6 +2602,25 @@ +@@ -2573,8 +2597,28 @@ + // determine if this is a legacy image or modules image + // modules image doesn't have "jre" subdirectory len = strlen(buf); ++ assert(len < buflen, "Ran out of buffer space"); jrelib_p = buf + len; +#ifndef __APPLE__ @@ -8653,7 +8720,7 @@ // Add the appropriate library subdir snprintf(jrelib_p, buflen-len, "/jre/lib"); if (0 != access(buf, F_OK)) { -@@ -2604,6 +2650,7 @@ +@@ -2604,11 +2648,12 @@ if (rp == NULL) return; } @@ -8661,7 +8728,13 @@ } } } -@@ -2707,10 +2754,14 @@ + +- strcpy(saved_jvm_path, buf); ++ strncpy(saved_jvm_path, buf, MAXPATHLEN); + } + + void os::print_jni_name_prefix_on(outputStream* st, int args_size) { +@@ -2707,10 +2752,14 @@ bool timedwait(unsigned int sec, int nsec); private: jlong currenttime() const; @@ -8677,7 +8750,7 @@ SEM_INIT(_semaphore, 0); } -@@ -2775,7 +2826,7 @@ +@@ -2775,7 +2824,7 @@ bool Semaphore::timedwait(unsigned int sec, int nsec) { struct timespec ts; @@ -8686,7 +8759,7 @@ while (1) { int result = sem_timedwait(&_semaphore, &ts); -@@ -2996,7 +3047,11 @@ +@@ -2996,7 +3045,11 @@ } void os::pd_free_memory(char *addr, size_t bytes, size_t alignment_hint) { @@ -8698,7 +8771,7 @@ } void os::numa_make_global(char *addr, size_t bytes) { -@@ -3422,7 +3477,9 @@ +@@ -3422,7 +3475,9 @@ #endif #endif @@ -8709,7 +8782,7 @@ // "exec" is passed in but not used. Creating the shared image for // the code cache doesn't have an SHM_X executable permission to check. assert(UseLargePages && UseSHM, "only for SHM large pages"); -@@ -3829,6 +3886,7 @@ +@@ -3829,6 +3884,7 @@ return OS_OK; #elif defined(__FreeBSD__) int ret = pthread_setprio(thread->osthread()->pthread_id(), newpri); @@ -8717,7 +8790,7 @@ #elif defined(__APPLE__) || defined(__NetBSD__) struct sched_param sp; int policy; -@@ -6093,3 +6151,9 @@ +@@ -6093,3 +6149,9 @@ return n; } @@ -8728,7 +8801,7 @@ +#endif + --- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -103,6 +103,12 @@ static bool hugetlbfs_sanity_check(bool warn, size_t page_size); @@ -8743,7 +8816,7 @@ static void init_thread_fpu_state(); --- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -31,10 +31,22 @@ # include "atomic_bsd_x86.inline.hpp" # include "orderAccess_bsd_x86.inline.hpp" @@ -8768,7 +8841,7 @@ // System includes --- ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -34,11 +34,26 @@ # include "orderAccess_bsd_x86.inline.hpp" # include "prefetch_bsd_x86.inline.hpp" @@ -8797,7 +8870,7 @@ // Contains inlined functions for class Thread and ThreadLocalStorage --- ./hotspot/src/os/linux/vm/globals_linux.hpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/os/linux/vm/globals_linux.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/os/linux/vm/globals_linux.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -40,6 +40,9 @@ product(bool, UseHugeTLBFS, false, \ "Use MAP_HUGETLB for large pages") \ @@ -8818,7 +8891,7 @@ define_pd_global(bool, UseOSErrorReporting, false); define_pd_global(bool, UseThreadPriorities, true) ; --- ./hotspot/src/os/linux/vm/jsig.c 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/os/linux/vm/jsig.c 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/os/linux/vm/jsig.c 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. @@ -8863,7 +8936,14 @@ * handlers and save the old ones. */ res = call_os_sigaction(sig, act, &oldAct); --- ./hotspot/src/os/linux/vm/os_linux.cpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/os/linux/vm/os_linux.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/os/linux/vm/os_linux.cpp 2014-07-15 23:24:53.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1999, 2014, 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 @@ -120,8 +120,16 @@ # include <inttypes.h> # include <sys/ioctl.h> @@ -8931,7 +9011,34 @@ } #ifndef SYS_clock_getres -@@ -2468,7 +2484,6 @@ +@@ -1598,9 +1614,6 @@ + ::abort(); + } + +-// unused on linux for now. +-void os::set_error_file(const char *logfile) {} +- + + // This method is a copy of JDK's sysGetLastErrorString + // from src/solaris/hpi/src/system_md.c +@@ -2397,6 +2410,7 @@ + // determine if this is a legacy image or modules image + // modules image doesn't have "jre" subdirectory + len = strlen(buf); ++ assert(len < buflen, "Ran out of buffer room"); + jrelib_p = buf + len; + snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch); + if (0 != access(buf, F_OK)) { +@@ -2419,7 +2433,7 @@ + } + } + +- strcpy(saved_jvm_path, buf); ++ strncpy(saved_jvm_path, buf, MAXPATHLEN); + } + + void os::print_jni_name_prefix_on(outputStream* st, int args_size) { +@@ -2468,7 +2482,6 @@ sem_t _semaphore; }; @@ -8939,7 +9046,7 @@ Semaphore::Semaphore() { sem_init(&_semaphore, 0, 0); } -@@ -2490,8 +2505,22 @@ +@@ -2490,8 +2503,22 @@ } bool Semaphore::timedwait(unsigned int sec, int nsec) { @@ -8963,7 +9070,7 @@ while (1) { int result = sem_timedwait(&_semaphore, &ts); -@@ -2748,35 +2777,7 @@ +@@ -2748,35 +2775,7 @@ int os::Linux::commit_memory_impl(char* addr, size_t size, size_t alignment_hint, bool exec) { @@ -9000,7 +9107,7 @@ if (err == 0) { realign_memory(addr, size, alignment_hint); } -@@ -2801,7 +2802,7 @@ +@@ -2801,7 +2800,7 @@ } void os::pd_realign_memory(char *addr, size_t bytes, size_t alignment_hint) { @@ -9009,7 +9116,7 @@ // We don't check the return value: madvise(MADV_HUGEPAGE) may not // be supported or the memory may already be backed by huge pages. ::madvise(addr, bytes, MADV_HUGEPAGE); -@@ -2814,7 +2815,7 @@ +@@ -2814,7 +2813,7 @@ // uncommitted at all. We don't do anything in this case to avoid creating a segment with // small pages on top of the SHM segment. This method always works for small pages, so we // allow that in any case. @@ -9018,7 +9125,7 @@ commit_memory(addr, bytes, alignment_hint, !ExecMem); } } -@@ -3183,11 +3184,31 @@ +@@ -3183,11 +3182,31 @@ return linux_mprotect(addr, size, PROT_READ|PROT_WRITE); } @@ -9053,7 +9160,7 @@ if (p != MAP_FAILED) { // We don't know if this really is a huge page or not. -@@ -3208,12 +3229,10 @@ +@@ -3208,12 +3227,10 @@ } fclose(fp); } @@ -9068,7 +9175,7 @@ warning("HugeTLBFS is not supported by the operating system."); } -@@ -3261,82 +3280,126 @@ +@@ -3261,82 +3278,126 @@ static size_t _large_page_size = 0; @@ -9162,16 +9269,16 @@ - fclose(fp); } + fclose(fp); - } - -- // print a warning if any large page related flag is specified on command line -- bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); ++ } ++ + if (!FLAG_IS_DEFAULT(LargePageSizeInBytes) && LargePageSizeInBytes != large_page_size) { + warning("Setting LargePageSizeInBytes has no effect on this OS. Large page size is " + SIZE_FORMAT "%s.", byte_size_in_proper_unit(large_page_size), + proper_unit_for_byte_size(large_page_size)); -+ } -+ + } + +- // print a warning if any large page related flag is specified on command line +- bool warn_on_failure = !FLAG_IS_DEFAULT(UseHugeTLBFS); + return large_page_size; +} @@ -9251,7 +9358,7 @@ set_coredump_filter(); } -@@ -3345,16 +3408,22 @@ +@@ -3345,16 +3406,22 @@ #define SHM_HUGETLB 04000 #endif @@ -9275,7 +9382,7 @@ !FLAG_IS_DEFAULT(LargePageSizeInBytes) ); char msg[128]; -@@ -3402,42 +3471,220 @@ +@@ -3402,42 +3469,220 @@ return NULL; } @@ -9313,15 +9420,13 @@ + if (addr == MAP_FAILED) { + warn_on_large_pages_failure(req_addr, bytes, errno); + return NULL; - } - -- // The memory is committed -- MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC); ++ } ++ + assert(is_ptr_aligned(addr, os::large_page_size()), "Must be"); - - return addr; - } - ++ ++ return addr; ++} ++ +char* os::Linux::reserve_memory_special_huge_tlbfs_mixed(size_t bytes, size_t alignment, char* req_addr, bool exec) { + size_t large_page_size = os::large_page_size(); + @@ -9434,8 +9539,10 @@ + } else { + assert(UseHugeTLBFS, "must be"); + addr = os::Linux::reserve_memory_special_huge_tlbfs(bytes, alignment, req_addr, exec); -+ } -+ + } + +- // The memory is committed +- MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC); + if (addr != NULL) { + if (UseNUMAInterleaving) { + numa_make_global(addr, bytes); @@ -9444,10 +9551,10 @@ + // The memory is committed + MemTracker::record_virtual_memory_reserve_and_commit((address)addr, bytes, mtNone, CALLER_PC); + } -+ -+ return addr; -+} -+ + + return addr; + } + +bool os::Linux::release_memory_special_shm(char* base, size_t bytes) { + // detaching the SHM segment will also delete it, see reserve_memory_special_shm() + return shmdt(base) == 0; @@ -9509,7 +9616,7 @@ } // Reserve memory at an arbitrary address, only if that area is -@@ -4493,6 +4740,26 @@ +@@ -4493,6 +4738,26 @@ Linux::clock_init(); initial_time_count = os::elapsed_counter(); @@ -9536,7 +9643,7 @@ pthread_mutex_init(&dl_mutex, NULL); // If the pagesize of the VM is greater than 8K determine the appropriate -@@ -4575,6 +4842,10 @@ +@@ -4575,6 +4840,10 @@ Linux::capture_initial_stack(JavaThread::stack_size_at_create()); @@ -9547,7 +9654,7 @@ Linux::libpthread_init(); if (PrintMiscellaneous && (Verbose || WizardMode)) { tty->print_cr("[HotSpot is running with %s, %s(%s)]\n", -@@ -4591,21 +4862,23 @@ +@@ -4591,21 +4860,23 @@ UseNUMA = false; } } @@ -9579,7 +9686,7 @@ } } if (!UseNUMA && ForceNUMA) { -@@ -5339,21 +5612,36 @@ +@@ -5339,21 +5610,36 @@ static struct timespec* compute_abstime(timespec* abstime, jlong millis) { if (millis < 0) millis = 0; @@ -9625,7 +9732,7 @@ return abstime; } -@@ -5445,7 +5733,7 @@ +@@ -5445,7 +5731,7 @@ status = os::Linux::safe_cond_timedwait(_cond, _mutex, &abst); if (status != 0 && WorkAroundNPTLTimedWaitHang) { pthread_cond_destroy (_cond); @@ -9634,7 +9741,7 @@ } assert_status(status == 0 || status == EINTR || status == ETIME || status == ETIMEDOUT, -@@ -5524,7 +5812,6 @@ +@@ -5524,7 +5810,6 @@ * is no need to track notifications. */ @@ -9642,7 +9749,7 @@ /* * This code is common to linux and solaris and will be moved to a * common place in dolphin. -@@ -5546,32 +5833,50 @@ +@@ -5546,32 +5831,50 @@ static void unpackTime(timespec* absTime, bool isAbsolute, jlong time) { assert (time > 0, "convertTime"); @@ -9712,7 +9819,7 @@ if (absTime->tv_nsec >= NANOSECS_PER_SEC) { absTime->tv_nsec -= NANOSECS_PER_SEC; ++absTime->tv_sec; // note: this must be <= max_secs -@@ -5650,16 +5955,20 @@ +@@ -5650,16 +5953,20 @@ OSThreadWaitState osts(thread->osthread(), false /* not Object.wait() */); jt->set_suspend_equivalent(); // cleared by handle_special_suspend_equivalent_condition() or java_suspend_self() @@ -9738,7 +9845,7 @@ assert_status(status == 0 || status == EINTR || status == ETIME || status == ETIMEDOUT, status, "cond_timedwait"); -@@ -5688,17 +5997,24 @@ +@@ -5688,17 +5995,24 @@ s = _counter; _counter = 1; if (s < 1) { @@ -9772,7 +9879,7 @@ } else { pthread_mutex_unlock(_mutex); assert (status == 0, "invariant") ; -@@ -5914,3 +6230,149 @@ +@@ -5914,3 +6228,149 @@ } #endif // JAVASE_EMBEDDED @@ -9923,7 +10030,7 @@ + +#endif --- ./hotspot/src/os/linux/vm/os_linux.hpp 2013-09-06 11:22:03.000000000 -0700 -+++ ./hotspot/src/os/linux/vm/os_linux.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/os/linux/vm/os_linux.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -32,6 +32,7 @@ class Linux { @@ -10016,7 +10123,7 @@ }; --- ./hotspot/src/os/posix/vm/os_posix.cpp 2013-09-06 11:22:04.000000000 -0700 -+++ ./hotspot/src/os/posix/vm/os_posix.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/os/posix/vm/os_posix.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* -* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -10081,8 +10188,42 @@ return false; } --- ./hotspot/src/os/solaris/vm/os_solaris.cpp 2013-09-06 11:22:04.000000000 -0700 -+++ ./hotspot/src/os/solaris/vm/os_solaris.cpp 2014-06-06 19:56:21.000000000 -0700 -@@ -3530,11 +3530,15 @@ ++++ ./hotspot/src/os/solaris/vm/os_solaris.cpp 2014-07-15 23:24:53.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, 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 +@@ -1877,9 +1877,6 @@ + ::abort(); // dump core (for debugging) + } + +-// unused +-void os::set_error_file(const char *logfile) {} +- + // DLL functions + + const char* os::dll_file_extension() { return ".so"; } +@@ -2561,6 +2558,7 @@ + // determine if this is a legacy image or modules image + // modules image doesn't have "jre" subdirectory + len = strlen(buf); ++ assert(len < buflen, "Ran out of buffer space"); + jrelib_p = buf + len; + snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch); + if (0 != access(buf, F_OK)) { +@@ -2581,7 +2579,7 @@ + } + } + +- strcpy(saved_jvm_path, buf); ++ strncpy(saved_jvm_path, buf, MAXPATHLEN); + } + + +@@ -3530,11 +3528,15 @@ return true; } @@ -10099,7 +10240,7 @@ char* retAddr = NULL; int shmid; key_t ismKey; -@@ -6862,3 +6866,9 @@ +@@ -6862,3 +6864,9 @@ return strlen(buffer); } @@ -10110,7 +10251,7 @@ +} +#endif --- ./hotspot/src/os/windows/vm/os_windows.cpp 2013-09-06 11:22:04.000000000 -0700 -+++ ./hotspot/src/os/windows/vm/os_windows.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/os/windows/vm/os_windows.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -10279,7 +10420,68 @@ st->print(" Build %d", osvi.dwBuildNumber); st->print(" %s", osvi.szCSDVersion); // service pack st->cr(); -@@ -3079,7 +3094,12 @@ +@@ -1758,27 +1773,28 @@ + // libjvm.so is installed there (append a fake suffix + // hotspot/libjvm.so). + char* java_home_var = ::getenv("JAVA_HOME"); +- if (java_home_var != NULL && java_home_var[0] != 0) { ++ if (java_home_var != NULL && java_home_var[0] != 0 && ++ strlen(java_home_var) < (size_t)buflen) { + +- strncpy(buf, java_home_var, buflen); ++ strncpy(buf, java_home_var, buflen); + +- // determine if this is a legacy image or modules image +- // modules image doesn't have "jre" subdirectory +- size_t len = strlen(buf); +- char* jrebin_p = buf + len; +- jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\"); +- if (0 != _access(buf, 0)) { +- jio_snprintf(jrebin_p, buflen-len, "\\bin\\"); +- } +- len = strlen(buf); +- jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll"); ++ // determine if this is a legacy image or modules image ++ // modules image doesn't have "jre" subdirectory ++ size_t len = strlen(buf); ++ char* jrebin_p = buf + len; ++ jio_snprintf(jrebin_p, buflen-len, "\\jre\\bin\\"); ++ if (0 != _access(buf, 0)) { ++ jio_snprintf(jrebin_p, buflen-len, "\\bin\\"); ++ } ++ len = strlen(buf); ++ jio_snprintf(buf + len, buflen-len, "hotspot\\jvm.dll"); + } + } + + if(buf[0] == '\0') { +- GetModuleFileName(vm_lib_handle, buf, buflen); ++ GetModuleFileName(vm_lib_handle, buf, buflen); + } +- strcpy(saved_jvm_path, buf); ++ strncpy(saved_jvm_path, buf, MAX_PATH); + } + + +@@ -2203,17 +2219,6 @@ + #endif //_WIN64 + + +-// Fatal error reporting is single threaded so we can make this a +-// static and preallocated. If it's more than MAX_PATH silently ignore +-// it. +-static char saved_error_file[MAX_PATH] = {0}; +- +-void os::set_error_file(const char *logfile) { +- if (strlen(logfile) <= MAX_PATH) { +- strncpy(saved_error_file, logfile, MAX_PATH); +- } +-} +- + static inline void report_error(Thread* t, DWORD exception_code, + address addr, void* siginfo, void* context) { + VMError err(t, exception_code, addr, siginfo, context); +@@ -3079,7 +3084,12 @@ return true; } @@ -10293,7 +10495,7 @@ const DWORD prot = exec ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE; const DWORD flags = MEM_RESERVE | MEM_COMMIT | MEM_LARGE_PAGES; -@@ -5584,3 +5604,9 @@ +@@ -5584,3 +5594,9 @@ } #endif @@ -10304,7 +10506,7 @@ +} +#endif --- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2013-09-06 11:22:04.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -945,7 +945,7 @@ if (rslt != 0) fatal(err_msg("pthread_stackseg_np failed with err = %d", rslt)); @@ -10315,7 +10517,7 @@ #elif defined(_ALLBSD_SOURCE) pthread_attr_t attr; --- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2013-09-06 11:22:04.000000000 -0700 -+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -24,7 +24,7 @@ */ @@ -10326,7 +10528,7 @@ #endif --- ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2013-09-06 11:22:04.000000000 -0700 -+++ ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -873,3 +873,46 @@ #endif } @@ -10375,7 +10577,7 @@ +#endif +} --- ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.hpp 2013-09-06 11:22:04.000000000 -0700 -+++ ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -36,4 +36,17 @@ // Note: Currently only used in 64 bit Windows implementations static bool register_code_area(char *low, char *high) { return true; } @@ -10395,7 +10597,7 @@ + #endif // OS_CPU_LINUX_X86_VM_OS_LINUX_X86_HPP --- ./hotspot/src/share/vm/c1/c1_GraphBuilder.cpp 2013-09-06 11:22:09.000000000 -0700 -+++ ./hotspot/src/share/vm/c1/c1_GraphBuilder.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/c1/c1_GraphBuilder.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -4178,7 +4178,9 @@ } } @@ -10408,7 +10610,7 @@ if (success && CIPrintMethodCodes) { callee->print_codes(); --- ./hotspot/src/share/vm/c1/c1_LIR.hpp 2013-09-06 11:22:09.000000000 -0700 -+++ ./hotspot/src/share/vm/c1/c1_LIR.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/c1/c1_LIR.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -2221,7 +2221,7 @@ typedef enum { inputMode, firstMode = inputMode, tempMode, outputMode, numModes, invalidMode = -1 } OprMode; @@ -10419,7 +10621,7 @@ }; --- ./hotspot/src/share/vm/c1/c1_LinearScan.cpp 2013-09-06 11:22:09.000000000 -0700 -+++ ./hotspot/src/share/vm/c1/c1_LinearScan.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/c1/c1_LinearScan.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1138,8 +1138,10 @@ } } @@ -10434,7 +10636,7 @@ switch (op->code()) { case lir_cmp: --- ./hotspot/src/share/vm/c1/c1_Runtime1.cpp 2013-09-06 11:22:09.000000000 -0700 -+++ ./hotspot/src/share/vm/c1/c1_Runtime1.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/c1/c1_Runtime1.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -911,16 +911,6 @@ // Return to the now deoptimized frame. } @@ -10476,7 +10678,7 @@ // --- ./hotspot/src/share/vm/classfile/classFileParser.cpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/classfile/classFileParser.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/classFileParser.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -10484,7 +10686,78 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it -@@ -2028,8 +2028,8 @@ +@@ -961,7 +961,7 @@ + "Wrong size %u for field's Signature attribute in class file %s", + attribute_length, CHECK); + } +- generic_signature_index = cfs->get_u2(CHECK); ++ generic_signature_index = parse_generic_signature_attribute(cp, CHECK); + } else if (attribute_name == vmSymbols::tag_runtime_visible_annotations()) { + runtime_visible_annotations_length = attribute_length; + runtime_visible_annotations = cfs->get_u1_buffer(); +@@ -1698,7 +1698,8 @@ + } + + // Sift through annotations, looking for those significant to the VM: +-void ClassFileParser::parse_annotations(u1* buffer, int limit, ++void ClassFileParser::parse_annotations(Handle class_loader, ++ u1* buffer, int limit, + constantPoolHandle cp, + ClassFileParser::AnnotationCollector* coll, + TRAPS) { +@@ -1736,7 +1737,7 @@ + } + + // Here is where parsing particular annotations will take place. +- AnnotationCollector::ID id = coll->annotation_index(aname); ++ AnnotationCollector::ID id = coll->annotation_index(class_loader, is_anonymous(), aname); + if (id == AnnotationCollector::_unknown) continue; + coll->set_annotation(id); + // If there are no values, just set the bit and move on: +@@ -1765,20 +1766,30 @@ + } + } + +-ClassFileParser::AnnotationCollector::ID ClassFileParser::AnnotationCollector::annotation_index(Symbol* name) { ++ClassFileParser::AnnotationCollector::ID ClassFileParser::AnnotationCollector::annotation_index(Handle class_loader, ++ bool is_anonymous, ++ Symbol* name) { + vmSymbols::SID sid = vmSymbols::find_sid(name); ++ // Privileged code can use all annotations. Other code silently drops some. ++ const bool privileged = class_loader.is_null() || is_anonymous || ++ class_loader()->klass()->klass_part()->name() == ++ vmSymbols::sun_misc_Launcher_ExtClassLoader(); + switch (sid) { + case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_ForceInline_signature): + if (_location != _in_method) break; // only allow for methods ++ if (!privileged) break; // only allow in privileged code + return _method_ForceInline; + case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_DontInline_signature): + if (_location != _in_method) break; // only allow for methods ++ if (!privileged) break; // only allow in privileged code + return _method_DontInline; + case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Compiled_signature): + if (_location != _in_method) break; // only allow for methods ++ if (!privileged) break; // only allow in privileged code + return _method_LambdaForm_Compiled; + case vmSymbols::VM_SYMBOL_ENUM_NAME(java_lang_invoke_LambdaForm_Hidden_signature): + if (_location != _in_method) break; // only allow for methods ++ if (!privileged) break; // only allow in privileged code + return _method_LambdaForm_Hidden; + default: break; + } +@@ -1818,8 +1829,8 @@ + // from the method back up to the containing klass. These flag values + // are added to klass's access_flags. + +-methodHandle ClassFileParser::parse_method(constantPoolHandle cp, bool is_interface, +- AccessFlags *promoted_flags, ++methodHandle ClassFileParser::parse_method(Handle class_loader, constantPoolHandle cp, ++ bool is_interface, AccessFlags *promoted_flags, + typeArrayHandle* method_annotations, + typeArrayHandle* method_parameter_annotations, + typeArrayHandle* method_default_annotations, +@@ -2028,8 +2039,8 @@ } if (lvt_cnt == max_lvt_cnt) { max_lvt_cnt <<= 1; @@ -10495,7 +10768,7 @@ } localvariable_table_start[lvt_cnt] = parse_localvariable_table(code_length, -@@ -2058,8 +2058,8 @@ +@@ -2058,8 +2069,8 @@ // Parse local variable type table if (lvtt_cnt == max_lvtt_cnt) { max_lvtt_cnt <<= 1; @@ -10506,19 +10779,116 @@ } localvariable_type_table_start[lvtt_cnt] = parse_localvariable_table(code_length, -@@ -2661,6 +2661,11 @@ - "Short length on BootstrapMethods in class file %s", - CHECK); +@@ -2122,13 +2133,12 @@ + "Invalid Signature attribute length %u in class file %s", + method_attribute_length, CHECK_(nullHandle)); + } +- cfs->guarantee_more(2, CHECK_(nullHandle)); // generic_signature_index +- generic_signature_index = cfs->get_u2_fast(); ++ generic_signature_index = parse_generic_signature_attribute(cp, CHECK_(nullHandle)); + } else if (method_attribute_name == vmSymbols::tag_runtime_visible_annotations()) { + runtime_visible_annotations_length = method_attribute_length; + runtime_visible_annotations = cfs->get_u1_buffer(); + assert(runtime_visible_annotations != NULL, "null visible annotations"); +- parse_annotations(runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle)); ++ parse_annotations(class_loader, runtime_visible_annotations, runtime_visible_annotations_length, cp, &parsed_annotations, CHECK_(nullHandle)); + cfs->skip_u1(runtime_visible_annotations_length, CHECK_(nullHandle)); + } else if (PreserveAllAnnotations && method_attribute_name == vmSymbols::tag_runtime_invisible_annotations()) { + runtime_invisible_annotations_length = method_attribute_length; +@@ -2357,8 +2367,8 @@ + // from the methods back up to the containing klass. These flag values + // are added to klass's access_flags. + +-objArrayHandle ClassFileParser::parse_methods(constantPoolHandle cp, bool is_interface, +- AccessFlags* promoted_flags, ++objArrayHandle ClassFileParser::parse_methods(Handle class_loader, constantPoolHandle cp, ++ bool is_interface, AccessFlags* promoted_flags, + bool* has_final_method, + objArrayOop* methods_annotations_oop, + objArrayOop* methods_parameter_annotations_oop, +@@ -2381,7 +2391,8 @@ + objArrayHandle methods_parameter_annotations; + objArrayHandle methods_default_annotations; + for (int index = 0; index < length; index++) { +- methodHandle method = parse_method(cp, is_interface, ++ methodHandle method = parse_method(class_loader, cp, ++ is_interface, + promoted_flags, + &method_annotations, + &method_parameter_annotations, +@@ -2490,6 +2501,17 @@ + } + } + ++// Parse generic_signature attribute for methods and fields ++u2 ClassFileParser::parse_generic_signature_attribute(constantPoolHandle cp, TRAPS) { ++ ClassFileStream* cfs = stream(); ++ cfs->guarantee_more(2, CHECK_0); // generic_signature_index ++ u2 generic_signature_index = cfs->get_u2_fast(); ++ check_property( ++ valid_symbol_at(cp, generic_signature_index), ++ "Invalid Signature attribute at constant pool index %u in class file %s", ++ generic_signature_index, CHECK_0); ++ return generic_signature_index; ++} + void ClassFileParser::parse_classfile_sourcefile_attribute(constantPoolHandle cp, TRAPS) { + ClassFileStream* cfs = stream(); +@@ -2654,7 +2676,13 @@ + ClassFileStream* cfs = stream(); + u1* current_start = cfs->current(); + +- cfs->guarantee_more(2, CHECK); // length + guarantee_property(attribute_byte_length > sizeof(u2), + "Invalid BootstrapMethods attribute length %u in class file %s", + attribute_byte_length, + CHECK); + - // The attribute contains a counted array of counted tuples of shorts, - // represending bootstrap specifiers: - // length*{bootstrap_method_index, argument_count*{argument_index}} -@@ -4051,9 +4056,8 @@ ++ cfs->guarantee_more(attribute_byte_length, CHECK); ++ + int attribute_array_length = cfs->get_u2_fast(); + + guarantee_property(_max_bootstrap_specifier_index < attribute_array_length, +@@ -2721,7 +2749,8 @@ + } + + +-void ClassFileParser::parse_classfile_attributes(constantPoolHandle cp, ++void ClassFileParser::parse_classfile_attributes(Handle class_loader, ++ constantPoolHandle cp, + ClassFileParser::ClassAnnotationCollector* parsed_annotations, + TRAPS) { + ClassFileStream* cfs = stream(); +@@ -2804,7 +2833,8 @@ + runtime_visible_annotations_length = attribute_length; + runtime_visible_annotations = cfs->get_u1_buffer(); + assert(runtime_visible_annotations != NULL, "null visible annotations"); +- parse_annotations(runtime_visible_annotations, ++ parse_annotations(class_loader, ++ runtime_visible_annotations, + runtime_visible_annotations_length, + cp, + parsed_annotations, +@@ -3167,7 +3197,8 @@ + objArrayOop methods_annotations_oop = NULL; + objArrayOop methods_parameter_annotations_oop = NULL; + objArrayOop methods_default_annotations_oop = NULL; +- objArrayHandle methods = parse_methods(cp, access_flags.is_interface(), ++ objArrayHandle methods = parse_methods(class_loader, cp, ++ access_flags.is_interface(), + &promoted_flags, + &has_final_method, + &methods_annotations_oop, +@@ -3181,7 +3212,7 @@ + + // Additional attributes + ClassAnnotationCollector parsed_annotations; +- parse_classfile_attributes(cp, &parsed_annotations, CHECK_(nullHandle)); ++ parse_classfile_attributes(class_loader, cp, &parsed_annotations, CHECK_(nullHandle)); + + // Make sure this is the end of class file stream + guarantee_property(cfs->at_eos(), "Extra bytes at the end of class file %s", CHECK_(nullHandle)); +@@ -4051,9 +4082,8 @@ for (int index = 0; index < num_methods; index++) { methodOop m = (methodOop)methods->obj_at(index); @@ -10530,8 +10900,85 @@ (m->name() != vmSymbols::object_initializer_name())) { Symbol* name = m->name(); +--- ./hotspot/src/share/vm/classfile/classFileParser.hpp 2013-09-06 11:22:10.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/classFileParser.hpp 2014-07-15 23:24:53.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, 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 +@@ -102,7 +102,7 @@ + assert((int)_annotation_LIMIT <= (int)sizeof(_annotations_present) * BitsPerByte, ""); + } + // If this annotation name has an ID, report it (or _none). +- ID annotation_index(Symbol* name); ++ ID annotation_index(Handle class_loader, bool is_anonymous, Symbol* name); + // Set the annotation name: + void set_annotation(ID id) { + assert((int)id >= 0 && (int)id < (int)_annotation_LIMIT, "oob"); +@@ -169,14 +169,14 @@ + u2* java_fields_count_ptr, TRAPS); + + // Method parsing +- methodHandle parse_method(constantPoolHandle cp, bool is_interface, +- AccessFlags* promoted_flags, ++ methodHandle parse_method(Handle class_loader, constantPoolHandle cp, ++ bool is_interface, AccessFlags* promoted_flags, + typeArrayHandle* method_annotations, + typeArrayHandle* method_parameter_annotations, + typeArrayHandle* method_default_annotations, + TRAPS); +- objArrayHandle parse_methods (constantPoolHandle cp, bool is_interface, +- AccessFlags* promoted_flags, ++ objArrayHandle parse_methods (Handle class_loader, constantPoolHandle cp, ++ bool is_interface, AccessFlags* promoted_flags, + bool* has_final_method, + objArrayOop* methods_annotations_oop, + objArrayOop* methods_parameter_annotations_oop, +@@ -202,6 +202,7 @@ + typeArrayOop parse_stackmap_table(u4 code_attribute_length, TRAPS); + + // Classfile attribute parsing ++ u2 parse_generic_signature_attribute(constantPoolHandle cp, TRAPS); + void parse_classfile_sourcefile_attribute(constantPoolHandle cp, TRAPS); + void parse_classfile_source_debug_extension_attribute(constantPoolHandle cp, int length, TRAPS); + u2 parse_classfile_inner_classes_attribute(u1* inner_classes_attribute_start, +@@ -210,7 +211,8 @@ + u2 enclosing_method_method_index, + constantPoolHandle cp, + TRAPS); +- void parse_classfile_attributes(constantPoolHandle cp, ++ void parse_classfile_attributes(Handle class_loader, ++ constantPoolHandle cp, + ClassAnnotationCollector* parsed_annotations, + TRAPS); + void parse_classfile_synthetic_attribute(constantPoolHandle cp, TRAPS); +@@ -224,7 +226,7 @@ + int runtime_invisible_annotations_length, TRAPS); + int skip_annotation(u1* buffer, int limit, int index); + int skip_annotation_value(u1* buffer, int limit, int index); +- void parse_annotations(u1* buffer, int limit, constantPoolHandle cp, ++ void parse_annotations(Handle class_loader, u1* buffer, int limit, constantPoolHandle cp, + /* Results (currently, only one result is supported): */ + AnnotationCollector* result, + TRAPS); +@@ -335,6 +337,12 @@ + : cp->tag_at(index).is_klass_reference()); + } + ++ // Checks that the cpool index is in range and is a utf8 ++ bool valid_symbol_at(constantPoolHandle cp, int cpool_index) { ++ return (cp->is_within_bounds(cpool_index) && ++ cp->tag_at(cpool_index).is_utf8()); ++ } ++ + public: + // Constructor + ClassFileParser(ClassFileStream* st) { set_stream(st); } --- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -10589,7 +11036,7 @@ java_lang_invoke_LambdaForm::compute_offsets(); java_lang_invoke_MethodType::compute_offsets(); --- ./hotspot/src/share/vm/classfile/javaClasses.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/classfile/javaClasses.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/javaClasses.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -10638,8 +11085,25 @@ static intptr_t vmindex(oop mname); static void set_vmindex(oop mname, intptr_t index); +--- ./hotspot/src/share/vm/classfile/stackMapTable.cpp 2013-09-06 11:22:10.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/stackMapTable.cpp 2014-07-15 23:24:53.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2003, 2014, 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 +@@ -134,6 +134,7 @@ + } + // check if uninitialized objects exist on backward branches + check_new_object(frame, target, CHECK_VERIFY(frame->verifier())); ++ frame->verifier()->update_furthest_jump(target); + } + + void StackMapTable::check_new_object( --- ./hotspot/src/share/vm/classfile/symbolTable.cpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/classfile/symbolTable.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/symbolTable.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -39,6 +39,9 @@ // -------------------------------------------------------------------------- @@ -10870,7 +11334,7 @@ } --- ./hotspot/src/share/vm/classfile/symbolTable.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/classfile/symbolTable.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/symbolTable.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -86,8 +86,8 @@ static bool _needs_rehashing; @@ -10968,7 +11432,7 @@ }; #endif // SHARE_VM_CLASSFILE_SYMBOLTABLE_HPP --- ./hotspot/src/share/vm/classfile/systemDictionary.cpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/classfile/systemDictionary.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/systemDictionary.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -585,7 +585,7 @@ assert(name != NULL && !FieldType::is_array(name) && !FieldType::is_obj(name), "invalid class name"); @@ -11069,7 +11533,7 @@ int SystemDictionary::_no_of_classes_unloading = 0; bool SystemDictionary::_should_write_unload_events = false; --- ./hotspot/src/share/vm/classfile/systemDictionary.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/classfile/systemDictionary.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/systemDictionary.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -11112,8 +11576,109 @@ static BoolObjectClosure* _is_alive; static int _no_of_classes_unloading; static bool _should_write_unload_events; +--- ./hotspot/src/share/vm/classfile/verifier.cpp 2013-09-06 11:22:10.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/verifier.cpp 2014-07-15 23:24:53.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1998, 2014, 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 +@@ -629,6 +629,9 @@ + bool no_control_flow = false; // Set to true when there is no direct control + // flow from current instruction to the next + // instruction in sequence ++ ++ set_furthest_jump(0); ++ + Bytecodes::Code opcode; + while (!bcs.is_last_bytecode()) { + // Check for recursive re-verification before each bytecode. +@@ -2239,6 +2242,29 @@ + "Bad <init> method call"); + return; + } ++ ++ // Make sure that this call is not jumped over. ++ if (bci < furthest_jump()) { ++ verify_error(ErrorContext::bad_code(bci), ++ "Bad <init> method call from inside of a branch"); ++ return; ++ } ++ ++ // Make sure that this call is not done from within a TRY block because ++ // that can result in returning an incomplete object. Simply checking ++ // (bci >= start_pc) also ensures that this call is not done after a TRY ++ // block. That is also illegal because this call must be the first Java ++ // statement in the constructor. ++ ExceptionTable exhandlers(_method()); ++ int exlength = exhandlers.length(); ++ for(int i = 0; i < exlength; i++) { ++ if (bci >= exhandlers.start_pc(i)) { ++ verify_error(ErrorContext::bad_code(bci), ++ "Bad <init> method call from after the start of a try block"); ++ return; ++ } ++ } ++ + current_frame->initialize_object(type, current_type()); + *this_uninit = true; + } else if (type.is_uninitialized()) { +@@ -2275,6 +2301,11 @@ + methodOop m = instanceKlass::cast(ref_klass)->uncached_lookup_method( + vmSymbols::object_initializer_name(), + cp->signature_ref_at(bcs->get_index_u2())); ++ if (m == NULL) { ++ verify_error(ErrorContext::bad_code(bci), ++ "Call to missing <init> method"); ++ return; ++ } + instanceKlassHandle mh(THREAD, m->method_holder()); + if (m->is_protected() && !mh->is_same_class_package(_klass())) { + bool assignable = current_type().is_assignable_from( +--- ./hotspot/src/share/vm/classfile/verifier.hpp 2013-09-06 11:22:10.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/verifier.hpp 2014-07-15 23:24:53.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1998, 2014, 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 +@@ -256,6 +256,9 @@ + + ErrorContext _error_context; // contains information about an error + ++ // Used to detect illegal jumps over calls to super() and this() in ctors. ++ int32_t _furthest_jump; ++ + void verify_method(methodHandle method, TRAPS); + char* generate_code_data(methodHandle m, u4 code_length, TRAPS); + void verify_exception_handler_table(u4 code_length, char* code_data, +@@ -398,6 +401,20 @@ + Symbol* create_temporary_symbol(const char *s, int length, TRAPS); + + TypeOrigin ref_ctx(const char* str, TRAPS); ++ ++ // Keep track of the furthest branch done in a method to make sure that ++ // there are no branches over calls to super() or this() from inside of ++ // a constructor. ++ int32_t furthest_jump() { return _furthest_jump; } ++ ++ void set_furthest_jump(int32_t target) { ++ _furthest_jump = target; ++ } ++ ++ void update_furthest_jump(int32_t target) { ++ if (target > _furthest_jump) _furthest_jump = target; ++ } ++ + }; + + inline int ClassVerifier::change_sig_to_verificationType( --- ./hotspot/src/share/vm/classfile/vmSymbols.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/classfile/vmSymbols.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/classfile/vmSymbols.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -11138,7 +11703,7 @@ template(forName0_name, "forName0") \ template(isJavaIdentifierStart_name, "isJavaIdentifierStart") \ --- ./hotspot/src/share/vm/code/nmethod.cpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/code/nmethod.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/code/nmethod.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -676,6 +676,7 @@ code_buffer->copy_oops_to(this); if (ScavengeRootsInCode && detect_scavenge_root_oops()) { @@ -11219,7 +11784,7 @@ // If the method is not entrant or zombie then a JMP is plastered over the // first few bytes. If an oop in the old code was there, that oop --- ./hotspot/src/share/vm/code/nmethod.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/code/nmethod.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/code/nmethod.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -548,8 +548,8 @@ void preserve_callee_argument_oops(frame fr, const RegisterMap *reg_map, @@ -11232,7 +11797,7 @@ void verify_scavenge_root_oops() PRODUCT_RETURN; --- ./hotspot/src/share/vm/code/relocInfo.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/code/relocInfo.hpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/share/vm/code/relocInfo.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -371,7 +371,7 @@ // "immediate" in the prefix header word itself. This optimization // is invisible outside this module.) @@ -11251,8 +11816,25 @@ assert(relocInfo::fits_into_immediate(datalen), "datalen in limits"); return relocInfo(relocInfo::data_prefix_tag, relocInfo::RAW_BITS, relocInfo::datalen_tag | datalen); } +--- ./hotspot/src/share/vm/compiler/compileBroker.cpp 2013-09-06 11:22:10.000000000 -0700 ++++ ./hotspot/src/share/vm/compiler/compileBroker.cpp 2014-07-15 23:24:54.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1999, 2014, 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 +@@ -1921,6 +1921,7 @@ + ResourceMark rm; + char* method_name = method->name()->as_C_string(); + strncpy(_last_method_compiled, method_name, CompileBroker::name_buffer_length); ++ _last_method_compiled[CompileBroker::name_buffer_length - 1] = '\0'; // ensure null terminated + char current_method[CompilerCounters::cmname_buffer_length]; + size_t maxLen = CompilerCounters::cmname_buffer_length; + --- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsOopClosures.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -58,8 +58,22 @@ MarkRefsIntoClosure(MemRegion span, CMSBitMap* bitMap); virtual void do_oop(oop* p); @@ -11279,7 +11861,7 @@ Prefetch::style prefetch_style() { return Prefetch::do_read; --- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -575,6 +575,7 @@ _restart_addr(NULL), _overflow_list(NULL), @@ -11794,7 +12376,7 @@ } - --- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -516,6 +516,8 @@ friend class ConcurrentMarkSweepThread; friend class ConcurrentMarkSweepGeneration; @@ -11850,7 +12432,7 @@ // Printing const char* name() const; --- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. @@ -11895,7 +12477,7 @@ #ifndef USDT2 HS_DTRACE_PROBE(hs_private, cms__remark__end); --- ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -114,6 +114,14 @@ } } @@ -11920,7 +12502,7 @@ + return _threads[worker_thread_num()]; +} --- ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentG1Refine.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -35,6 +35,7 @@ class G1CollectedHeap; class G1HotCardCache; @@ -11947,7 +12529,7 @@ void print_worker_threads_on(outputStream* st) const; --- ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1154,10 +1154,9 @@ if (VerifyDuringGC) { @@ -12153,7 +12735,7 @@ _out->cr(); } --- ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -1224,6 +1224,12 @@ size_t _hum_prev_live_bytes; size_t _hum_next_live_bytes; @@ -12168,7 +12750,7 @@ if (total == 0) { return 0.0; --- ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2013-09-06 11:22:10.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/concurrentMark.inline.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -81,7 +81,7 @@ size_t* marked_bytes_array, BitMap* task_card_bm) { @@ -12179,7 +12761,7 @@ HeapWord* start = mr.start(); HeapWord* end = mr.end(); --- ./hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CardCounts.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -65,9 +65,7 @@ // threshold limit is no more than this. guarantee(G1ConcRSHotCardLimit <= max_jubyte, "sanity"); @@ -12192,7 +12774,7 @@ // Allocate/Reserve the counts table --- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -23,6 +23,7 @@ */ @@ -13326,7 +13908,7 @@ + CodeCache::blobs_do(&blob_cl); +} --- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -31,6 +31,7 @@ #include "gc_implementation/g1/g1HRPrinter.hpp" #include "gc_implementation/g1/g1MonitoringSupport.hpp" @@ -13647,7 +14229,7 @@ template <class T> void immediate_rs_update(HeapRegion* from, T* p, int tid) { if (!from->is_survivor()) { --- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectedHeap.inline.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -29,6 +29,7 @@ #include "gc_implementation/g1/g1CollectedHeap.hpp" #include "gc_implementation/g1/g1AllocRegion.inline.hpp" @@ -13666,7 +14248,7 @@ inline RefToScanQueue* G1CollectedHeap::task_queue(int i) const { --- ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -310,7 +310,8 @@ void G1CollectorPolicy::initialize_flags() { set_min_alignment(HeapRegion::GrainBytes); @@ -13678,7 +14260,7 @@ vm_exit_during_initialization("Invalid survivor ratio specified"); } --- ./hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1EvacFailure.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -41,11 +41,11 @@ private: G1CollectedHeap* _g1; @@ -13694,7 +14276,7 @@ virtual void do_oop(narrowOop* p) { do_oop_work(p); } virtual void do_oop( oop* p) { do_oop_work(p); } --- ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -161,6 +161,8 @@ _last_update_rs_times_ms(_max_gc_threads, "%.1lf"), _last_update_rs_processed_buffers(_max_gc_threads, "%d"), @@ -13774,7 +14356,7 @@ double misc_time_ms = pause_time_sec * MILLIUNITS - accounted_time_ms(); print_stats(1, "Other", misc_time_ms); --- ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1GCPhaseTimes.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -119,6 +119,8 @@ WorkerDataArray<double> _last_update_rs_times_ms; WorkerDataArray<int> _last_update_rs_processed_buffers; @@ -13834,7 +14416,7 @@ return _last_obj_copy_times_ms.average(); } --- ./hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -177,10 +177,8 @@ GenMarkSweep::follow_mdo_weak_refs(); assert(GenMarkSweep::_marking_stack.is_empty(), "just drained"); @@ -13885,7 +14467,7 @@ _humongous_proxy_set("G1MarkSweep Humongous Proxy Set") { } --- ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -34,6 +34,7 @@ #include "gc_implementation/g1/g1OopClosures.inline.hpp" #include "gc_implementation/g1/g1RemSet.inline.hpp" @@ -14179,7 +14761,7 @@ _g1->set_refine_cte_cl_concurrency(false); if (SafepointSynchronize::is_at_safepoint()) { --- ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSet.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -25,6 +25,8 @@ #ifndef SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP #define SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSET_HPP @@ -14276,7 +14858,7 @@ class CountNonCleanMemRegionClosure: public MemRegionClosure { --- ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -0,0 +1,354 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -14633,7 +15215,7 @@ + blk.print_summary_on(out); +} --- ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1RemSetSummary.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -14754,7 +15336,7 @@ + +#endif // SHARE_VM_GC_IMPLEMENTATION_G1_G1REMSETSUMMARY_HPP --- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -76,6 +76,46 @@ } } @@ -14878,7 +15460,7 @@ } } --- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -37,7 +37,14 @@ // snapshot-at-the-beginning marking. @@ -14941,7 +15523,7 @@ // Adds card-table logging to the post-barrier. --- ./hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/g1_globals.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -71,6 +71,9 @@ diagnostic(bool, G1TraceConcRefinement, false, \ "Trace G1 concurrent refinement") \ @@ -14969,7 +15551,7 @@ G1_FLAGS(DECLARE_DEVELOPER_FLAG, DECLARE_PD_DEVELOPER_FLAG, DECLARE_PRODUCT_FLAG, DECLARE_PD_PRODUCT_FLAG, DECLARE_DIAGNOSTIC_FLAG, DECLARE_EXPERIMENTAL_FLAG, DECLARE_NOTPRODUCT_FLAG, DECLARE_MANAGEABLE_FLAG, DECLARE_PRODUCT_RW_FLAG) --- ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -23,6 +23,7 @@ */ @@ -15486,7 +16068,7 @@ // G1OffsetTableContigSpace code; copied from space.cpp. Hope this can go --- ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegion.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -51,6 +51,7 @@ class HeapRegionRemSetIterator; class HeapRegion; @@ -15532,7 +16114,7 @@ void print_on(outputStream* st) const; --- ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -33,6 +33,7 @@ #include "oops/oop.inline.hpp" #include "utilities/bitMap.inline.hpp" @@ -15707,7 +16289,7 @@ HeapRegionRemSetIterator:: --- ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/heapRegionRemSet.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -37,6 +37,7 @@ class HeapRegionRemSetIterator; class PerRegionTable; @@ -15781,7 +16363,7 @@ // Called during a stop-world phase to perform any deferred cleanups. --- ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -79,6 +79,10 @@ void reset() { if (_buf != NULL) _index = _sz; } @@ -15794,7 +16376,7 @@ void enqueue(void* ptr) { if (!_active) return; --- ./hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/parNew/parNewGeneration.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -923,7 +923,7 @@ GenCollectedHeap* gch = GenCollectedHeap::heap(); @@ -15814,7 +16396,7 @@ gc_tracer.report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions()); } --- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parallelScavengeHeap.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -90,14 +90,16 @@ og_min_size, og_max_size, yg_min_size, yg_max_size); @@ -15868,7 +16450,7 @@ ReservedHeapSpace heap_rs1(pg_max_size, pg_align, og_max_size + yg_max_size, og_align, addr); --- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -24,6 +24,7 @@ #include "precompiled.hpp" @@ -15936,7 +16518,7 @@ + +#endif /* !PRODUCT */ --- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psAdaptiveSizePolicy.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -238,7 +238,6 @@ void major_collection_begin(); void major_collection_end(size_t amount_live, GCCause::Cause gc_cause); @@ -15959,7 +16541,7 @@ size_t average_old_live_in_bytes() const { return (size_t) avg_old_live()->average(); --- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psMarkSweep.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -116,7 +116,7 @@ assert(heap->kind() == CollectedHeap::ParallelScavengeHeap, "Sanity"); GCCause::Cause gc_cause = heap->gc_cause(); @@ -15999,7 +16581,7 @@ _gc_tracer->report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions()); --- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. @@ -16046,7 +16628,7 @@ _gc_tracer.report_dense_prefix(dense_prefix(old_space_id)); _gc_tracer.report_gc_end(_gc_timer.gc_end(), _gc_timer.time_partitions()); --- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2013-09-06 11:22:11.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psScavenge.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -266,7 +266,7 @@ assert(_preserved_mark_stack.is_empty(), "should be empty"); assert(_preserved_oop_stack.is_empty(), "should be empty"); @@ -16126,7 +16708,7 @@ _gc_tracer.report_gc_end(_gc_timer.gc_end(), _gc_timer.time_partitions()); --- ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -16325,7 +16907,7 @@ assert(!iter.has_next(), "Too many elements"); } --- ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTimer.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -28,6 +28,7 @@ #include "memory/allocation.hpp" #include "prims/jni_md.h" @@ -16449,7 +17031,7 @@ class TimePartitionPhasesIterator { --- ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -33,6 +33,7 @@ #include "memory/referenceProcessorStats.hpp" #include "runtime/os.hpp" @@ -16553,7 +17135,7 @@ YoungGCTracer::report_gc_end_impl(timestamp, time_partitions); --- ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTrace.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -34,6 +34,7 @@ #ifndef SERIALGC #include "gc_implementation/g1/g1YCTypes.hpp" @@ -16687,7 +17269,7 @@ void report_evacuation_failed(EvacuationFailedInfo& ef_info); --- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceSend.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -28,8 +28,10 @@ #include "gc_implementation/shared/gcTrace.hpp" #include "gc_implementation/shared/gcWhen.hpp" @@ -16709,7 +17291,7 @@ } } --- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -16763,7 +17345,7 @@ gclog_or_tty->flush(); } --- ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/shared/gcTraceTime.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -26,6 +26,7 @@ #define SHARE_VM_GC_IMPLEMENTATION_SHARED_GCTRACETIME_HPP @@ -16782,7 +17364,7 @@ public: GCTraceTime(const char* title, bool doit, bool print_cr, GCTimer* timer); --- ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -28,8 +28,10 @@ #include "memory/heapInspection.hpp" #include "trace/tracing.hpp" @@ -16805,7 +17387,7 @@ bool ObjectCountEventSender::should_send_event() { --- ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_implementation/shared/objectCountEventSender.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -29,10 +29,11 @@ #include "memory/allocation.hpp" @@ -16820,7 +17402,7 @@ }; --- ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -121,6 +121,14 @@ } } @@ -16837,7 +17419,7 @@ const GCHeapSummary& heap_summary = create_heap_summary(); const PermGenSummary& perm_summary = create_perm_gen_summary(); --- ./hotspot/src/share/vm/gc_interface/collectedHeap.hpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/gc_interface/collectedHeap.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/gc_interface/collectedHeap.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -49,6 +49,7 @@ class Thread; class ThreadClosure; @@ -16859,7 +17441,7 @@ void trace_heap_after_gc(GCTracer* gc_tracer); --- ./hotspot/src/share/vm/interpreter/interpreterRuntime.cpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -16893,7 +17475,7 @@ + } +IRT_END --- ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -16910,7 +17492,7 @@ // Statics & fields --- ./hotspot/src/share/vm/memory/cardTableModRefBS.cpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/cardTableModRefBS.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/cardTableModRefBS.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -400,60 +400,6 @@ inline_write_ref_field(field, newVal); } @@ -16973,7 +17555,7 @@ void CardTableModRefBS::non_clean_card_iterate_possibly_parallel(Space* sp, MemRegion mr, --- ./hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/cardTableModRefBS.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -344,34 +344,10 @@ _byte_map[card_index] = dirty_card_val(); } @@ -17010,7 +17592,7 @@ // This would be the 0th element of _byte_map, if the heap started at 0x0. // But since the heap starts at some higher address, this points to somewhere --- ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -230,6 +230,8 @@ alignment = lcm(os::large_page_size(), alignment); } @@ -17021,7 +17603,7 @@ } --- ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2013-09-06 11:22:12.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved. @@ -17079,7 +17661,7 @@ void DefNewGeneration::gc_prologue(bool full) { --- ./hotspot/src/share/vm/memory/genCollectedHeap.cpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/genCollectedHeap.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/genCollectedHeap.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -99,17 +99,19 @@ guarantee(HeapWordSize == wordSize, "HeapWordSize must equal wordSize"); @@ -17228,7 +17810,7 @@ #endif --- ./hotspot/src/share/vm/memory/generation.cpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/generation.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/generation.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -17257,7 +17839,7 @@ SpecializationStats::print(); } --- ./hotspot/src/share/vm/memory/generation.hpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/generation.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/generation.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -457,6 +457,7 @@ // expected to be GC worker thread-local, with the worker index // indicated by "thr_num". @@ -17267,7 +17849,7 @@ // Some generations may require some cleanup actions before allowing // a verification. --- ./hotspot/src/share/vm/memory/iterator.cpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/iterator.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/iterator.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -70,7 +70,7 @@ } @@ -17278,7 +17860,7 @@ void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) { --- ./hotspot/src/share/vm/memory/sharedHeap.cpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/sharedHeap.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/sharedHeap.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -64,7 +64,8 @@ } _sh = this; // ch is static, should be set only once. @@ -17309,7 +17891,7 @@ // visit all of the CodeCache, collect from the non-perm roots if any. // This makes the code cache function temporarily as a source of strong --- ./hotspot/src/share/vm/memory/sharedHeap.hpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/sharedHeap.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/sharedHeap.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -267,7 +267,8 @@ ScanningOption so, OopClosure* roots, @@ -17321,7 +17903,7 @@ // Apply "blk" to all the weak roots of the system. These include // JNI weak roots, the code cache, system dictionary, symbol table, --- ./hotspot/src/share/vm/memory/universe.cpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/universe.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/universe.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -826,17 +826,23 @@ // 32Gb // OopEncodingHeapMax == NarrowOopHeapMax << LogMinObjAlignmentInBytes; @@ -17382,7 +17964,7 @@ SymbolTable::verify(); if (!silent) gclog_or_tty->print("strs "); --- ./hotspot/src/share/vm/memory/universe.hpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/memory/universe.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/memory/universe.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -380,7 +380,7 @@ static NARROW_OOP_MODE narrow_oop_mode(); @@ -17411,7 +17993,7 @@ static int verify_count() { return _verify_count; } --- ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -17667,7 +18249,7 @@ const char* constantPoolOopDesc::printable_name_at(int which) { --- ./hotspot/src/share/vm/oops/constantPoolOop.hpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/oops/constantPoolOop.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/oops/constantPoolOop.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -17732,7 +18314,7 @@ int find_matching_entry(int pattern_i, constantPoolHandle search_cp, TRAPS); int orig_length() const { return _orig_length; } --- ./hotspot/src/share/vm/oops/instanceKlass.cpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/oops/instanceKlass.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/oops/instanceKlass.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -17790,7 +18372,7 @@ #ifndef PRODUCT --- ./hotspot/src/share/vm/oops/instanceKlass.hpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/oops/instanceKlass.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/oops/instanceKlass.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -17827,8 +18409,63 @@ public: // JVMTI support jint jvmti_class_status() const; +--- ./hotspot/src/share/vm/oops/klassVtable.cpp 2013-09-06 11:22:13.000000000 -0700 ++++ ./hotspot/src/share/vm/oops/klassVtable.cpp 2014-07-15 23:24:54.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, 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 +@@ -209,6 +209,17 @@ + // For bytecodes not produced by javac together it is possible that a method does not override + // the superclass's method, but might indirectly override a super-super class's vtable entry + // If none found, return a null superk, else return the superk of the method this does override ++// For public and protected methods: if they override a superclass, they will ++// also be overridden themselves appropriately. ++// Private methods do not override and are not overridden. ++// Package Private methods are trickier: ++// e.g. P1.A, pub m ++// P2.B extends A, package private m ++// P1.C extends B, public m ++// P1.C.m needs to override P1.A.m and can not override P2.B.m ++// Therefore: all package private methods need their own vtable entries for ++// them to be the root of an inheritance overriding decision ++// Package private methods may also override other vtable entries + instanceKlass* klassVtable::find_transitive_override(instanceKlass* initialsuper, methodHandle target_method, + int vtable_index, Handle target_loader, Symbol* target_classname, Thread * THREAD) { + instanceKlass* superk = initialsuper; +@@ -310,8 +321,12 @@ + ((klass->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) + && ((super_klass = find_transitive_override(super_klass, target_method, i, target_loader, + target_classname, THREAD)) != (instanceKlass*)NULL))) { +- // overriding, so no new entry +- allocate_new = false; ++ ++ // Package private methods always need a new entry to root their own ++ // overriding. They may also override other methods. ++ if (!target_method()->is_package_private()) { ++ allocate_new = false; ++ } + + if (checkconstraints) { + // Override vtable entry if passes loader constraint check +@@ -433,6 +448,12 @@ + return true; + } + ++ // Package private methods always need a new entry to root their own ++ // overriding. This allows transitive overriding to work. ++ if (target_method()->is_package_private()) { ++ return true; ++ } ++ + // search through the super class hierarchy to see if we need + // a new entry + ResourceMark rm; --- ./hotspot/src/share/vm/oops/objArrayKlass.cpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/oops/objArrayKlass.cpp 2014-04-19 01:27:07.000000000 -0700 ++++ ./hotspot/src/share/vm/oops/objArrayKlass.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -149,7 +149,7 @@ if (element_is_null || Klass::cast((new_val->klass()))->is_subtype_of(bound)) { @@ -17839,7 +18476,7 @@ // We must do a barrier to cover the partial copy. const size_t pd = pointer_delta(p, dst, (size_t)heapOopSize); --- ./hotspot/src/share/vm/opto/bytecodeInfo.cpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/bytecodeInfo.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/bytecodeInfo.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -103,7 +103,7 @@ // Allows targeted inlining if(callee_method->should_inline()) { @@ -17886,7 +18523,7 @@ tty->print_cr(" \\-> discounting inline depth"); } --- ./hotspot/src/share/vm/opto/c2_globals.hpp 2013-09-06 11:22:13.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/c2_globals.hpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/c2_globals.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -173,6 +173,9 @@ product_pd(intx, LoopUnrollLimit, \ "Unroll loop bodies with node count less than this") \ @@ -17898,7 +18535,7 @@ "Minimum number of unroll loop bodies before checking progress" \ "of rounds of unroll,optimize,..") \ --- ./hotspot/src/share/vm/opto/callGenerator.hpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/callGenerator.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/callGenerator.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -158,8 +158,9 @@ virtual void print_inlining_late(const char* msg) { ShouldNotReachHere(); } @@ -17911,7 +18548,7 @@ }; --- ./hotspot/src/share/vm/opto/coalesce.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/coalesce.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/coalesce.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -135,20 +135,26 @@ // After cloning some rematerialized instruction, clone any MachProj's that // follow it. Example: Intel zero is XOR, kills flags. Sparc FP constants @@ -17964,7 +18601,7 @@ const RegMask *rm = C->matcher()->idealreg2spillmask[m->ideal_reg()]; copy = new (C) MachSpillCopyNode( m, *rm, *rm ); --- ./hotspot/src/share/vm/opto/compile.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/compile.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/compile.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -642,7 +642,7 @@ _inlining_progress(false), _inlining_incrementally(false), @@ -18101,7 +18738,7 @@ } } --- ./hotspot/src/share/vm/opto/compile.hpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/compile.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/compile.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -18232,7 +18869,7 @@ static void print_statistics() PRODUCT_RETURN; --- ./hotspot/src/share/vm/opto/doCall.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/doCall.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/doCall.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -42,9 +42,9 @@ #include "runtime/sharedRuntime.hpp" @@ -18246,7 +18883,7 @@ method->print_short_name(); tty->cr(); --- ./hotspot/src/share/vm/opto/graphKit.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/graphKit.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/graphKit.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -3596,7 +3596,7 @@ Node* marking = __ load(__ ctrl(), marking_adr, TypeInt::INT, active_type, Compile::AliasIdxRaw); @@ -18295,7 +18932,7 @@ } __ end_if(); } __ end_if(); --- ./hotspot/src/share/vm/opto/library_call.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/library_call.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/library_call.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -525,7 +525,7 @@ Compile* C = kit.C; int nodes = C->unique(); @@ -18423,7 +19060,7 @@ tty->print_cr(" JVM state at this point:"); for (int i = _depth; i >= 1; i--) { --- ./hotspot/src/share/vm/opto/loopTransform.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/loopTransform.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/loopTransform.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -623,8 +623,6 @@ } @@ -18452,7 +19089,7 @@ // but NOT before the pre-loop. _igvn.replace_input_of(cd, 0, ctrl); // ctrl, not NULL --- ./hotspot/src/share/vm/opto/matcher.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/matcher.cpp 2014-04-19 01:27:07.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/matcher.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -464,17 +464,17 @@ C->FIRST_STACK_mask().Clear(); @@ -18515,7 +19152,7 @@ assert(aligned_stack_mask.is_AllStack(), "should be infinite stack"); *idealreg2spillmask[Op_VecY] = *idealreg2regmask[Op_VecY]; --- ./hotspot/src/share/vm/opto/memnode.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/memnode.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/memnode.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -1957,6 +1957,11 @@ if (t != NULL) { // constant oop => constant klass @@ -18529,7 +19166,7 @@ } if (!t->is_klass()) { --- ./hotspot/src/share/vm/opto/memnode.hpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/memnode.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/memnode.hpp 2014-07-15 23:24:54.000000000 -0700 @@ -204,6 +204,17 @@ protected: const Type* load_array_final_field(const TypeKlassPtr *tkls, @@ -18583,7 +19220,7 @@ //------------------------------LoadKlassNode---------------------------------- --- ./hotspot/src/share/vm/opto/output.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/output.cpp 2014-04-19 01:27:07.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/output.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -345,6 +345,11 @@ uint* jmp_offset = NEW_RESOURCE_ARRAY(uint,nblocks); uint* jmp_size = NEW_RESOURCE_ARRAY(uint,nblocks); @@ -18623,7 +19260,7 @@ offset -= nop_size; --- ./hotspot/src/share/vm/opto/reg_split.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/opto/reg_split.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/opto/reg_split.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -391,10 +391,15 @@ #endif // See if the cloned def kills any flags, and copy those kills as well @@ -18644,7 +19281,7 @@ return spill; --- ./hotspot/src/share/vm/prims/jni.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/prims/jni.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/prims/jni.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -5042,14 +5042,22 @@ tty->print_cr("Running test: " #unit_test_function_call); \ unit_test_function_call @@ -18669,7 +19306,7 @@ } } --- ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp 2013-09-06 11:22:14.000000000 -0700 -+++ ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/prims/jvmtiClassFileReconstituter.cpp 2014-07-15 23:24:54.000000000 -0700 @@ -204,7 +204,7 @@ write_attribute_name_index("Code"); @@ -18680,7 +19317,7 @@ write_u4(code_size); copy_bytecodes(method, (unsigned char*)writeable_address(code_size)); --- ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. @@ -19264,7 +19901,7 @@ // Flush references to any obsolete methods from the oop map cache // so that obsolete methods are not pinned. --- ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -370,6 +370,13 @@ // _index_map_p contains any entries. int _index_map_count; @@ -19316,7 +19953,7 @@ void flush_dependent_code(instanceKlassHandle k_h, TRAPS); --- ./hotspot/src/share/vm/prims/methodHandles.cpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/prims/methodHandles.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/prims/methodHandles.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. @@ -19876,7 +20513,7 @@ return res; } --- ./hotspot/src/share/vm/prims/methodHandles.hpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/prims/methodHandles.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/prims/methodHandles.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. @@ -19952,7 +20589,7 @@ + #endif // SHARE_VM_PRIMS_METHODHANDLES_HPP --- ./hotspot/src/share/vm/prims/whitebox.cpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/prims/whitebox.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/prims/whitebox.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -27,6 +27,8 @@ #include "memory/universe.hpp" #include "oops/oop.inline.hpp" @@ -19985,7 +20622,7 @@ #undef CC --- ./hotspot/src/share/vm/runtime/arguments.cpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/arguments.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/arguments.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -1447,6 +1447,17 @@ } FLAG_SET_DEFAULT(UseParallelGC, true); @@ -20113,7 +20750,7 @@ if (TraceBytecodesAt != 0) { TraceBytecodes = true; --- ./hotspot/src/share/vm/runtime/arguments.hpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/arguments.hpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/arguments.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -27,6 +27,7 @@ #include "runtime/java.hpp" @@ -20146,7 +20783,7 @@ static bool check_gc_consistency(); // Check consistecy or otherwise of VM argument settings --- ./hotspot/src/share/vm/runtime/atomic.cpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/atomic.cpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/atomic.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -54,6 +54,12 @@ #ifdef TARGET_OS_ARCH_windows_x86 # include "atomic_windows_x86.inline.hpp" @@ -20161,7 +20798,7 @@ # include "atomic_linux_arm.inline.hpp" #endif --- ./hotspot/src/share/vm/runtime/frame.cpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/frame.cpp 2014-06-06 19:56:20.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/frame.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -23,6 +23,7 @@ */ @@ -20197,7 +20834,7 @@ st->print("J " PTR_FORMAT, pc()); } --- ./hotspot/src/share/vm/runtime/globals.hpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/globals.hpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/globals.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -1697,6 +1697,9 @@ product(bool, CMSAbortSemantics, false, \ "Whether abort-on-overflow semantics is implemented") \ @@ -20261,7 +20898,7 @@ \ product(intx, SoftRefLRUPolicyMSPerMB, 1000, \ --- ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -20333,7 +20970,7 @@ GCMutexLocker::GCMutexLocker(Monitor * mutex) { --- ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -20369,7 +21006,7 @@ // A MutexLocker provides mutual exclusion with respect to a given mutex // for the scope which contains the locker. The lock is an OS lock, not --- ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -1684,7 +1684,7 @@ } iterator->_notified = 1 ; @@ -20389,7 +21026,7 @@ iterator->TState = ObjectWaiter::TS_ENTER ; } --- ./hotspot/src/share/vm/runtime/os.cpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/os.cpp 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/os.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -399,13 +399,6 @@ if (_native_java_library == NULL) { vm_exit_during_initialization("Unable to load native library", ebuf); @@ -20415,7 +21052,14 @@ char* sysclasspath = format_boot_path(classpath_format, home, home_len, fileSep, pathSep); if (sysclasspath == NULL) return false; --- ./hotspot/src/share/vm/runtime/os.hpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/os.hpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/os.hpp 2014-07-15 23:24:55.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, 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 @@ -30,6 +30,9 @@ #include "runtime/extendedPC.hpp" #include "runtime/handles.hpp" @@ -20437,7 +21081,17 @@ static bool release_memory_special(char* addr, size_t bytes); static void large_page_init(); static size_t large_page_size(); -@@ -755,8 +758,8 @@ +@@ -460,9 +463,6 @@ + // run cmd in a separate process and return its exit code; or -1 on failures + static int fork_and_exec(char *cmd); + +- // Set file to send error reports. +- static void set_error_file(const char *logfile); +- + // os::exit() is merged with vm_exit() + // static void exit(int num); + +@@ -755,8 +755,8 @@ # include "os_windows.hpp" #endif #ifdef TARGET_OS_FAMILY_bsd @@ -20448,7 +21102,7 @@ #ifdef TARGET_OS_ARCH_linux_x86 # include "os_linux_x86.hpp" --- ./hotspot/src/share/vm/runtime/reflection.cpp 2013-09-06 11:22:15.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/reflection.cpp 2014-01-18 12:16:14.000000000 -0800 ++++ ./hotspot/src/share/vm/runtime/reflection.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -460,7 +460,7 @@ // doesn't have a classloader. if ((current_class == NULL) || @@ -20459,7 +21113,7 @@ return true; } --- ./hotspot/src/share/vm/runtime/sweeper.cpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/sweeper.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/sweeper.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -20563,7 +21217,7 @@ #endif } --- ./hotspot/src/share/vm/runtime/sweeper.hpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/sweeper.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/sweeper.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -20619,7 +21273,7 @@ static void record_sweep(nmethod* nm, int line); static void report_events(int id, address entry); --- ./hotspot/src/share/vm/runtime/thread.cpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/thread.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/thread.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -3416,9 +3416,10 @@ } @@ -20651,7 +21305,7 @@ // get the Java runtime name after java.lang.System is initialized --- ./hotspot/src/share/vm/runtime/virtualspace.cpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/virtualspace.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/virtualspace.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -42,8 +42,19 @@ @@ -20885,7 +21539,7 @@ + #endif --- ./hotspot/src/share/vm/runtime/virtualspace.hpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/virtualspace.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/virtualspace.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -90,6 +90,7 @@ public: @@ -20895,7 +21549,7 @@ ReservedSpace(size_t size, size_t alignment, bool large, char* requested_address = NULL, --- ./hotspot/src/share/vm/runtime/vmThread.cpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/vmThread.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/vmThread.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -305,7 +305,7 @@ os::check_heap(); // Silent verification so as not to pollute normal output, @@ -20915,7 +21569,7 @@ } --- ./hotspot/src/share/vm/runtime/vm_operations.cpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/vm_operations.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/vm_operations.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -189,7 +189,8 @@ } @@ -20927,7 +21581,7 @@ bool VM_PrintThreads::doit_prologue() { --- ./hotspot/src/share/vm/runtime/vm_operations.hpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/runtime/vm_operations.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/runtime/vm_operations.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -303,9 +303,9 @@ class VM_Verify: public VM_Operation { @@ -20941,7 +21595,7 @@ void doit(); }; --- ./hotspot/src/share/vm/services/attachListener.cpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/services/attachListener.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/services/attachListener.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -282,6 +282,20 @@ return JNI_ERR; } @@ -21002,7 +21656,7 @@ { MutexLocker mu(Threads_lock); JavaThread* listener_thread = new JavaThread(&attach_listener_thread_entry); --- ./hotspot/src/share/vm/services/gcNotifier.cpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/services/gcNotifier.cpp 2014-01-18 12:16:14.000000000 -0800 ++++ ./hotspot/src/share/vm/services/gcNotifier.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. @@ -21027,7 +21681,7 @@ klassOop k = Management::sun_management_GarbageCollectorImpl_klass(CHECK); instanceKlassHandle gc_mbean_klass(THREAD, k); --- ./hotspot/src/share/vm/services/management.cpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/services/management.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/services/management.cpp 2014-07-15 23:24:55.000000000 -0700 @@ -851,8 +851,6 @@ total_used += u.used(); total_committed += u.committed(); @@ -21073,7 +21727,7 @@ } else if (flag->is_uint64_t()) { uint64_t uvalue = (uint64_t)new_value.j; --- ./hotspot/src/share/vm/services/memTracker.hpp 2013-09-06 11:22:16.000000000 -0700 -+++ ./hotspot/src/share/vm/services/memTracker.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/services/memTracker.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -302,6 +302,13 @@ } } @@ -21089,7 +21743,7 @@ // record memory type on virtual memory base address static inline void record_virtual_memory_type(address base, MEMFLAGS flags, --- ./hotspot/src/share/vm/trace/noTraceBackend.hpp 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/noTraceBackend.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/noTraceBackend.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -25,9 +25,7 @@ #define SHARE_VM_TRACE_NOTRACEBACKEND_HPP @@ -21108,7 +21762,7 @@ - - --- ./hotspot/src/share/vm/trace/trace.xml 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/trace.xml 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/trace.xml 2014-07-15 23:24:55.000000000 -0700 @@ -169,8 +169,8 @@ <value type="UINT" field="gcId" label="GC ID" relation="GC_ID" /> <value type="GCNAME" field="name" label="Name" description="The name of the Garbage Collector" /> @@ -21121,7 +21775,7 @@ <event id="GCParallelOld" path="vm/gc/collector/parold_garbage_collection" label="Parallel Old Garbage Collection" --- ./hotspot/src/share/vm/trace/traceBackend.hpp 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/traceBackend.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/traceBackend.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -26,10 +26,11 @@ #if INCLUDE_TRACE @@ -21148,7 +21802,7 @@ } }; --- ./hotspot/src/share/vm/trace/traceEvent.hpp 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/traceEvent.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/traceEvent.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -21217,7 +21871,7 @@ TraceEventId id() const { --- ./hotspot/src/share/vm/trace/traceEventClasses.xsl 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/traceEventClasses.xsl 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/traceEventClasses.xsl 2014-07-15 23:24:55.000000000 -0700 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- @@ -21302,7 +21956,7 @@ <xsl:text> ts.print(", "); --- ./hotspot/src/share/vm/trace/traceEventIds.xsl 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/traceEventIds.xsl 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/traceEventIds.xsl 2014-07-15 23:24:55.000000000 -0700 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- @@ -21322,7 +21976,7 @@ <xsl:template match="/"> <xsl:call-template name="file-header"/> --- ./hotspot/src/share/vm/trace/traceMacros.hpp 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/traceMacros.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/traceMacros.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -21331,7 +21985,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./hotspot/src/share/vm/trace/traceTime.hpp 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/traceTime.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/traceTime.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -21348,7 +22002,7 @@ -#endif +#endif // SHARE_VM_TRACE_TRACETIME_HPP --- ./hotspot/src/share/vm/trace/traceTypes.xsl 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/traceTypes.xsl 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/traceTypes.xsl 2014-07-15 23:24:55.000000000 -0700 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- @@ -21385,7 +22039,7 @@ enum JVMContentType { _not_a_content_type = (JVM_CONTENT_TYPES_START - 1), --- ./hotspot/src/share/vm/trace/tracetypes.xml 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/tracetypes.xml 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/tracetypes.xml 2014-07-15 23:24:55.000000000 -0700 @@ -60,7 +60,7 @@ <types> <content_types> @@ -21426,7 +22080,7 @@ <!-- VM Thread ID Note: changed from U2 to U8 for hotspot --> <primary_type symbol="VMTHREAD" datatype="U8" contenttype="VMTHREAD" --- ./hotspot/src/share/vm/trace/tracing.hpp 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/trace/tracing.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/trace/tracing.hpp 2014-07-15 23:24:55.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -21434,8 +22088,34 @@ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it +--- ./hotspot/src/share/vm/utilities/events.cpp 2013-09-06 11:22:17.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/events.cpp 2014-07-15 23:24:53.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, 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 +@@ -93,7 +93,7 @@ + va_start(ap, format); + // Save a copy of begin message and log it. + _buffer.printv(format, ap); +- Events::log(NULL, _buffer); ++ Events::log(NULL, "%s", (const char*)_buffer); + va_end(ap); + } + } +@@ -102,6 +102,6 @@ + if (LogEvents) { + // Append " done" to the begin message and log it + _buffer.append(" done"); +- Events::log(NULL, _buffer); ++ Events::log(NULL, "%s", (const char*)_buffer); + } + } --- ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -373,6 +373,14 @@ #define align_size_up_(size, alignment) (((size) + ((alignment) - 1)) & ~((alignment) - 1)) @@ -21467,7 +22147,7 @@ #define align_object_size_(size) align_size_up_(size, MinObjAlignment) --- ./hotspot/src/share/vm/utilities/growableArray.hpp 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/growableArray.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/growableArray.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -194,6 +194,7 @@ void clear() { _len = 0; } @@ -21491,7 +22171,7 @@ for (int i = 0; i < _len; i++) { if (f(token, _data[i])) return i; --- ./hotspot/src/share/vm/utilities/ticks.cpp 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/src/share/vm/utilities/ticks.cpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/ticks.cpp 2014-07-15 23:24:53.000000000 -0700 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -21562,7 +22242,7 @@ + return time_conversion<jlong>(span, MILLISECONDS); +} --- ./hotspot/src/share/vm/utilities/ticks.hpp 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/src/share/vm/utilities/ticks.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/ticks.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -21676,7 +22356,7 @@ + +#endif // SHARE_VM_UTILITIES_TICKS_HPP --- ./hotspot/src/share/vm/utilities/ticks.inline.hpp 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/src/share/vm/utilities/ticks.inline.hpp 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/ticks.inline.hpp 2014-07-15 23:24:53.000000000 -0700 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -21776,7 +22456,14 @@ + +#endif // SHARE_VM_UTILITIES_TICKS_INLINE_HPP --- ./hotspot/src/share/vm/utilities/vmError.cpp 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2014-06-06 19:56:23.000000000 -0700 ++++ ./hotspot/src/share/vm/utilities/vmError.cpp 2014-07-15 23:24:53.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2003, 2014, 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 @@ -583,6 +583,13 @@ while (count++ < StackPrintLimit) { fr.print_on_error(st, buf, sizeof(buf)); @@ -21791,8 +22478,16 @@ if (os::is_first_C_frame(&fr)) break; fr = os::get_sender_for_C_frame(&fr); } +@@ -944,7 +951,6 @@ + if (fd != -1) { + out.print_raw("# An error report file with more information is saved as:\n# "); + out.print_raw_cr(buffer); +- os::set_error_file(buffer); + + log.set_fd(fd); + } else { --- ./hotspot/test/compiler/5091921/Test7005594.sh 2013-09-06 11:22:17.000000000 -0700 -+++ ./hotspot/test/compiler/5091921/Test7005594.sh 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/test/compiler/5091921/Test7005594.sh 2014-07-15 23:24:55.000000000 -0700 @@ -60,6 +60,9 @@ # Windows/MKS MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'` @@ -21804,7 +22499,7 @@ echo "Unable to determine amount of physical memory on the machine" fi --- ./hotspot/test/compiler/8004051/Test8004051.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/compiler/8004051/Test8004051.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/compiler/8004051/Test8004051.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -21863,7 +22558,7 @@ + } +} --- ./hotspot/test/compiler/codegen/LoadWithMask.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/compiler/codegen/LoadWithMask.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/compiler/codegen/LoadWithMask.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -21910,7 +22605,7 @@ + } +} --- ./hotspot/test/compiler/codegen/LoadWithMask2.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/compiler/codegen/LoadWithMask2.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/compiler/codegen/LoadWithMask2.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -21968,7 +22663,7 @@ + } +} --- ./hotspot/test/compiler/gcbarriers/G1CrashTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/compiler/gcbarriers/G1CrashTest.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/compiler/gcbarriers/G1CrashTest.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -22055,7 +22750,7 @@ + } +} --- ./hotspot/test/compiler/print/PrintInlining.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/compiler/print/PrintInlining.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/compiler/print/PrintInlining.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -22094,7 +22789,7 @@ + } +} --- ./hotspot/test/compiler/reflection/ArrayNewInstanceOfVoid.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/compiler/reflection/ArrayNewInstanceOfVoid.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/compiler/reflection/ArrayNewInstanceOfVoid.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -22141,7 +22836,7 @@ + } +} --- ./hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/compiler/regalloc/C1ObjectSpillInLogicOp.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -22189,7 +22884,7 @@ + } +} --- ./hotspot/test/gc/8000311/Test8000311.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/8000311/Test8000311.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/8000311/Test8000311.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -22282,7 +22977,7 @@ - } -} --- ./hotspot/test/gc/TestVerifyDuringStartup.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/TestVerifyDuringStartup.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/TestVerifyDuringStartup.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -22330,7 +23025,7 @@ + } +} --- ./hotspot/test/gc/TestVerifySilently.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/TestVerifySilently.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/TestVerifySilently.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -22417,7 +23112,7 @@ + } +} --- ./hotspot/test/gc/arguments/TestDynMaxHeapFreeRatio.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/arguments/TestDynMaxHeapFreeRatio.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/arguments/TestDynMaxHeapFreeRatio.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -22484,7 +23179,7 @@ + +} --- ./hotspot/test/gc/arguments/TestDynMinHeapFreeRatio.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/arguments/TestDynMinHeapFreeRatio.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/arguments/TestDynMinHeapFreeRatio.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -22549,7 +23244,7 @@ + } +} --- ./hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,143 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -22695,7 +23390,7 @@ +} + --- ./hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -22790,7 +23485,7 @@ +} + --- ./hotspot/test/gc/g1/TestSummarizeRSetStats.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/g1/TestSummarizeRSetStats.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/g1/TestSummarizeRSetStats.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -22878,7 +23573,7 @@ +} + --- ./hotspot/test/gc/g1/TestSummarizeRSetStatsPerRegion.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsPerRegion.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsPerRegion.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -22936,7 +23631,7 @@ + } +} --- ./hotspot/test/gc/g1/TestSummarizeRSetStatsThreads.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsThreads.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsThreads.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,83 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -23022,7 +23717,7 @@ + } +} --- ./hotspot/test/gc/g1/TestSummarizeRSetStatsTools.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsTools.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/gc/g1/TestSummarizeRSetStatsTools.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,154 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -23179,7 +23874,7 @@ +} + --- ./hotspot/test/runtime/6929067/Test6929067.sh 2013-09-06 11:22:19.000000000 -0700 -+++ ./hotspot/test/runtime/6929067/Test6929067.sh 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/runtime/6929067/Test6929067.sh 2014-07-15 23:24:55.000000000 -0700 @@ -3,6 +3,7 @@ ## ## @test Test6929067.sh @@ -23216,7 +23911,7 @@ ./invoke exit $? --- ./hotspot/test/runtime/7107135/Test7107135.sh 2013-09-06 11:22:19.000000000 -0700 -+++ ./hotspot/test/runtime/7107135/Test7107135.sh 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/runtime/7107135/Test7107135.sh 2014-07-15 23:24:55.000000000 -0700 @@ -27,6 +27,7 @@ ## ## @test Test7107135.sh @@ -23250,7 +23945,7 @@ ld -shared -z noexecstack -o libtest-rw.so test.o --- ./hotspot/test/runtime/7110720/Test7110720.sh 2013-09-06 11:22:20.000000000 -0700 -+++ ./hotspot/test/runtime/7110720/Test7110720.sh 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/test/runtime/7110720/Test7110720.sh 2014-07-15 23:24:55.000000000 -0700 @@ -28,7 +28,7 @@ # set platform-dependent variables OS=`uname -s` @@ -23261,7 +23956,7 @@ RM=/bin/rm CP=/bin/cp --- ./hotspot/test/runtime/7158800/Test7158800.sh 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/runtime/7158800/Test7158800.sh 2014-06-06 19:56:22.000000000 -0700 ++++ ./hotspot/test/runtime/7158800/Test7158800.sh 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,91 @@ +#!/bin/sh +# @@ -23355,7 +24050,7 @@ + exit 0 +fi --- ./hotspot/test/runtime/jsig/Test8017498.sh 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/runtime/jsig/Test8017498.sh 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/runtime/jsig/Test8017498.sh 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,94 @@ +#!/bin/sh + @@ -23452,7 +24147,7 @@ +echo "Test Failed" +exit 1 --- ./hotspot/test/runtime/jsig/TestJNI.c 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/runtime/jsig/TestJNI.c 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/runtime/jsig/TestJNI.c 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -23510,7 +24205,7 @@ +#endif + --- ./hotspot/test/runtime/jsig/TestJNI.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/runtime/jsig/TestJNI.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/runtime/jsig/TestJNI.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -23555,7 +24250,7 @@ +} + --- ./hotspot/test/runtime/memory/LargePages/TestLargePagesFlags.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/runtime/memory/LargePages/TestLargePagesFlags.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/runtime/memory/LargePages/TestLargePagesFlags.java 2014-07-15 23:24:55.000000000 -0700 @@ -0,0 +1,389 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -23947,7 +24642,7 @@ + } +} --- ./hotspot/test/testlibrary/OutputAnalyzerTest.java 2013-09-06 11:22:20.000000000 -0700 -+++ ./hotspot/test/testlibrary/OutputAnalyzerTest.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/testlibrary/OutputAnalyzerTest.java 2014-07-15 23:24:56.000000000 -0700 @@ -172,5 +172,22 @@ } catch (RuntimeException e) { // expected @@ -23972,7 +24667,7 @@ } } --- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/DynamicVMOptionChecker.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/DynamicVMOptionChecker.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/DynamicVMOptionChecker.java 2014-07-15 23:24:56.000000000 -0700 @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -24086,7 +24781,7 @@ + +} --- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java 2013-09-06 11:22:20.000000000 -0700 -+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/OutputAnalyzer.java 2014-07-15 23:24:56.000000000 -0700 @@ -241,7 +241,38 @@ } @@ -24128,7 +24823,7 @@ * @param expectedExitValue Expected exit value from process * @throws RuntimeException If the exit value from the process did not match the expected value --- ./hotspot/test/testlibrary/com/oracle/java/testlibrary/TestDynamicVMOption.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/TestDynamicVMOption.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/testlibrary/com/oracle/java/testlibrary/TestDynamicVMOption.java 2014-07-15 23:24:56.000000000 -0700 @@ -0,0 +1,95 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -24226,7 +24921,7 @@ + +} --- ./hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java 2013-09-06 11:22:20.000000000 -0700 -+++ ./hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java 2014-06-06 19:56:21.000000000 -0700 ++++ ./hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java 2014-07-15 23:24:56.000000000 -0700 @@ -78,4 +78,7 @@ public native void NMTUncommitMemory(long addr, long size); public native void NMTReleaseMemory(long addr, long size); @@ -24236,7 +24931,7 @@ + public native void deoptimizeAll(); } --- ./jaxp/.hgtags 2013-09-06 11:22:52.000000000 -0700 -+++ ./jaxp/.hgtags 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/.hgtags 2014-07-15 23:25:08.000000000 -0700 @@ -123,6 +123,7 @@ bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146 067fb18071e3872698f6218724958bd0cebf30a3 jdk7u1-b01 @@ -24268,7 +24963,7 @@ 5e87aee78c91efa65bd5aeb37bcc1c1c637a7f0c jdk7u25-b12 83b80c094befd08cbac4247d9b8f12c6a039f23f jdk7u25-b13 68cc0d2a49f09b5c611b2775f2e66de1022bdedc jdk7u25-b14 -@@ -343,3 +360,84 @@ +@@ -343,3 +360,105 @@ 66363323f14d85d4ab28e883a3323b9d72dea5fd jdk7u40-b42 c0bd71414ea513f54f23965936a837fca093ac91 jdk7u40-b43 91bc4534851265291bb3b16452a0968d6909979f jdk7u40-b60 @@ -24321,6 +25016,7 @@ +8275dc4db7f852edb331ae48d663d08b9ab2b5c7 jdk7u55-b02 +381e73f93a83e8d3bfd7dbf79f4f363a8fd6442f jdk7u55-b03 +c72c57f71c2ba6362d9ccfbf4743947b9ecefcac jdk7u55-b04 ++5592b0c44617022e3c136eedfa1e98d4f254c964 jdk7u65-b00 +5592b0c44617022e3c136eedfa1e98d4f254c964 jdk7u55-b05 +c59d714090080ad2e06f0ca5e8d354403059d8ce jdk7u55-b06 +125ea54089add3a16898b801a9989bf6cca05da6 jdk7u55-b07 @@ -24334,6 +25030,8 @@ +01f26830f88cf4f10897416fe1f4f372efcdecf5 jdk7u55-b30 +26187a65c765b3177f1b7ff0638259bf66f9ec47 jdk7u55-b14 +5be97f6c25d9eb3ef0a05fc860964cb3d27134b0 jdk7u55-b31 ++94f3ad704f28d5ec65f7a3b1cbf5cfe7e42151f3 jdk7u55-b32 ++476aad2c130e2b1b7033fa6789754c03151da95c jdk7u55-b33 +d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00 +ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01 +050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02 @@ -24351,11 +25049,29 @@ +2814f43a6c73414dcb2b799e1a52d5b44688590d jdk7u60-b14 +10eed57b66336660f71f7524f2283478bdf373dc jdk7u60-b15 +fefd2d5c524b0be78876d9b98d926abda2828e79 jdk7u60-b16 -+ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b18 +ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b17 ++ba6b0b5dfe5a0f50fac95c488c8a5400ea07d4f8 jdk7u60-b18 ++dd5a398eedc7031a4fb8682bc423e787db465c9e jdk7u65-b01 ++581752d32aebea959fec84e8ae692e1f63d2c4a8 jdk7u60-b19 ++27909f138bdb9ffdd2ab4bded231c7ccc2264046 jdk7u65-b02 ++b3307181bd0f1a2c6e1e2c403b87a76e34452110 jdk7u65-b03 ++efa9425faaf402b7ea9c6226eb08236d8fa1ff2b jdk7u65-b04 ++319df7bff5bf7a9c2d659dd9021b918e729fa56f jdk7u65-b05 ++5fd236e2f1bbc09349858f9c56dd223b6d6f21f6 jdk7u65-b06 ++e1ae0b54e22200f2d67de39f6a16899ad4a1e574 jdk7u65-b07 ++86e93799766d67102a37559b3831abcc825d7e24 jdk7u65-b08 ++e24ee8ca453937c11be2fdbab0b4244aa7ec22bd jdk7u65-b09 ++6c20039a2e0104f30697e22dc06fe83ff7a43d39 jdk7u65-b10 ++50625e7c71b9b1d31bb901aec66366cacc239b3b jdk7u65-b11 ++b56b145c3d85b649188a40a91106005a3ebfcf2b jdk7u65-b12 ++3a8933cb0219594b72c797732768070fa23c491e jdk7u65-b13 ++ddb29a56b839563502b9f80deca5d6064641f1d7 jdk7u65-b14 ++708c636721447ebf679c2c754cb36a503c6177b8 jdk7u65-b15 ++a34a9f6740955e1cd844c5b701d76dbe7290913a jdk7u65-b16 ++178512d1bd9caf56d61811ad0d4b4269475407aa jdk7u65-b17 --- ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java 2014-06-06 19:56:13.000000000 -0700 -@@ -39,33 +39,138 @@ ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/XalanConstants.java 2014-07-15 23:25:04.000000000 -0700 +@@ -39,33 +39,150 @@ // // Constants // @@ -24416,6 +25132,13 @@ + */ + public static final String JDK_XML_NAME_LIMIT = + ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit"; ++ ++ /** ++ * JDK maxElementDepth limit ++ */ ++ public static final String JDK_MAX_ELEMENT_DEPTH = ++ ORACLE_JAXP_PROPERTY_PREFIX + "maxElementDepth"; ++ + /** + * JDK property indicating whether the parser shall print out entity + * count information @@ -24464,6 +25187,11 @@ + */ + public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit"; + ++ /** ++ * JDK maxElementDepth limit ++ */ ++ public static final String SP_MAX_ELEMENT_DEPTH = "jdk.xml.maxElementDepth"; ++ + //legacy System Properties + public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit"; + public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ; @@ -24507,7 +25235,7 @@ //all access keyword public static final String ACCESS_EXTERNAL_ALL = "all"; -@@ -83,6 +188,19 @@ +@@ -83,6 +200,19 @@ ORACLE_JAXP_PROPERTY_PREFIX + "xmlSecurityPropertyManager"; /** @@ -24528,7 +25256,7 @@ */ public static final boolean IS_JDK8_OR_ABOVE = isJavaVersionAtLeast(8); --- ./jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/lib/ExsltStrings.java 2014-07-15 23:25:04.000000000 -0700 @@ -52,6 +52,8 @@ */ public class ExsltStrings extends ExsltBase @@ -24612,7 +25340,7 @@ - } --- ./jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/lib/Extensions.java 2014-07-15 23:25:04.000000000 -0700 @@ -56,6 +56,7 @@ */ public class Extensions @@ -24723,7 +25451,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources.java 2014-07-15 23:25:04.000000000 -0700 @@ -471,7 +471,13 @@ // Error messages... @@ -24754,7 +25482,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java 2014-07-15 23:25:04.000000000 -0700 @@ -471,7 +471,13 @@ // Error messages... @@ -24785,7 +25513,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java 2014-07-15 23:25:04.000000000 -0700 @@ -471,7 +471,13 @@ // Error messages... @@ -24816,7 +25544,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java 2014-07-15 23:25:04.000000000 -0700 @@ -471,7 +471,13 @@ // Error messages... @@ -24847,7 +25575,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java 2014-07-15 23:25:04.000000000 -0700 @@ -471,7 +471,13 @@ // Error messages... @@ -24878,7 +25606,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java 2014-07-15 23:25:04.000000000 -0700 @@ -471,7 +471,13 @@ // Error messages... @@ -24909,7 +25637,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java 2014-07-15 23:25:04.000000000 -0700 @@ -471,7 +471,13 @@ // Error messages... @@ -24940,7 +25668,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java 2014-07-15 23:25:04.000000000 -0700 @@ -472,7 +472,13 @@ // Error messages... @@ -24971,7 +25699,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java 2014-07-15 23:25:04.000000000 -0700 @@ -471,7 +471,13 @@ // Error messages... @@ -25002,7 +25730,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java 2014-07-15 23:25:04.000000000 -0700 @@ -471,7 +471,13 @@ // Error messages... @@ -25033,7 +25761,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java 2014-07-15 23:25:04.000000000 -0700 @@ -471,7 +471,13 @@ // Error messages... @@ -25064,7 +25792,7 @@ // ================= INFRASTRUCTURE ====================== --- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeatureManager.java 2014-07-15 23:25:04.000000000 -0700 @@ -0,0 +1,124 @@ +/* + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -25191,7 +25919,7 @@ + +} --- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java 2014-07-15 23:25:04.000000000 -0700 @@ -0,0 +1,215 @@ +/* + * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -25409,7 +26137,7 @@ + } +} --- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java 2014-04-19 01:27:01.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/ObjectFactory.java 2014-07-15 23:25:04.000000000 -0700 @@ -54,8 +54,8 @@ // // Constants @@ -25465,7 +26193,7 @@ try { providerClass = cl.loadClass(className); --- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java 2014-04-19 01:27:01.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/SecuritySupport.java 2014-07-15 23:25:04.000000000 -0700 @@ -57,7 +57,7 @@ return securitySupport; } @@ -25476,8 +26204,8 @@ public Object run() { ClassLoader cl = null; --- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2014-06-06 19:56:13.000000000 -0700 -@@ -0,0 +1,435 @@ ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java 2014-07-15 23:25:04.000000000 -0700 +@@ -0,0 +1,437 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25556,7 +26284,9 @@ + GENEAL_ENTITY_SIZE_LIMIT(XalanConstants.JDK_GENEAL_ENTITY_SIZE_LIMIT, + XalanConstants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0), + PARAMETER_ENTITY_SIZE_LIMIT(XalanConstants.JDK_PARAMETER_ENTITY_SIZE_LIMIT, -+ XalanConstants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000); ++ XalanConstants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000), ++ MAX_ELEMENT_DEPTH_LIMIT(XalanConstants.JDK_MAX_ELEMENT_DEPTH, ++ XalanConstants.SP_MAX_ELEMENT_DEPTH, 0, 0); + + final String apiProperty; + final String systemProperty; @@ -25914,7 +26644,7 @@ + } +} --- ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java 2014-07-15 23:25:04.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. @@ -26045,7 +26775,7 @@ - } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java 2014-07-15 23:25:04.000000000 -0700 @@ -23,6 +23,7 @@ package com.sun.org.apache.xalan.internal.xsltc.cmdline; @@ -26064,7 +26794,7 @@ int c; --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java 2014-07-15 23:25:04.000000000 -0700 @@ -42,6 +42,7 @@ import com.sun.org.apache.bcel.internal.generic.LocalVariableGen; import com.sun.org.apache.bcel.internal.generic.NEW; @@ -26101,7 +26831,7 @@ final String clazz = _chosenMethod.getDeclaringClass().getName(); --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Import.java 2014-07-15 23:25:04.000000000 -0700 @@ -86,7 +86,7 @@ if (input == null) { docToLoad = SystemIDResolver.getAbsoluteURI(docToLoad, currLoadedDoc); @@ -26112,7 +26842,7 @@ if (accessError != null) { --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Include.java 2014-07-15 23:25:04.000000000 -0700 @@ -87,7 +87,7 @@ if (input == null) { docToLoad = SystemIDResolver.getAbsoluteURI(docToLoad, currLoadedDoc); @@ -26123,7 +26853,7 @@ if (accessError != null) { --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2013-09-06 11:22:55.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java 2014-07-15 23:25:04.000000000 -0700 @@ -28,6 +28,7 @@ import com.sun.org.apache.xalan.internal.utils.FactoryImpl; import com.sun.org.apache.xalan.internal.utils.ObjectFactory; @@ -26163,7 +26893,7 @@ if (accessError != null) { ErrorMsg msg = new ErrorMsg(ErrorMsg.ACCESSING_XSLT_TARGET_ERR, --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java 2014-07-15 23:25:04.000000000 -0700 @@ -43,12 +43,14 @@ import com.sun.org.apache.bcel.internal.classfile.JavaClass; @@ -26243,7 +26973,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26273,7 +27003,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26303,7 +27033,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26333,7 +27063,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26363,7 +27093,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26393,7 +27123,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26423,7 +27153,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26453,7 +27183,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26483,7 +27213,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26513,7 +27243,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26543,7 +27273,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26573,7 +27303,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26603,7 +27333,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26633,7 +27363,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java 2014-07-15 23:25:04.000000000 -0700 @@ -90,7 +90,13 @@ */ @@ -26663,7 +27393,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java 2014-07-15 23:25:04.000000000 -0700 @@ -955,6 +955,9 @@ if (Double.isNaN(d) || Double.isInfinite(d)) return(Double.toString(d)); @@ -26675,7 +27405,7 @@ StringBuffer result = threadLocalStringBuffer.get(); result.setLength(0); --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -26706,7 +27436,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java 2013-09-06 11:22:56.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java 2014-07-15 23:25:04.000000000 -0700 @@ -79,7 +79,13 @@ */ @@ -26737,7 +27467,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java 2014-07-15 23:25:04.000000000 -0700 @@ -79,7 +79,13 @@ */ @@ -26768,7 +27498,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -26799,7 +27529,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -26830,7 +27560,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -26861,7 +27591,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -26892,7 +27622,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -26923,7 +27653,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -26954,7 +27684,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -26985,7 +27715,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java 2014-07-15 23:25:04.000000000 -0700 @@ -79,7 +79,13 @@ */ @@ -27016,7 +27746,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -27047,7 +27777,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -27078,7 +27808,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java 2014-07-15 23:25:04.000000000 -0700 @@ -81,7 +81,13 @@ */ @@ -27109,7 +27839,7 @@ } --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java 2014-07-15 23:25:04.000000000 -0700 @@ -29,7 +29,7 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.URIResolver; @@ -27138,7 +27868,7 @@ if ("true".equals(tfactory.getAttribute(TransformerFactoryImpl.ENABLE_INLINING))) --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java 2014-07-15 23:25:04.000000000 -0700 @@ -23,6 +23,23 @@ package com.sun.org.apache.xalan.internal.xsltc.trax; @@ -27370,7 +28100,7 @@ // Set a document loader (for xsl:include/import) if defined --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java 2014-07-15 23:25:04.000000000 -0700 @@ -25,6 +25,7 @@ import com.sun.org.apache.xalan.internal.XalanConstants; @@ -27408,7 +28138,7 @@ /** * Return the state of the services mechanism feature. --- ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xalan/internal/xsltc/trax/Util.java 2014-07-15 23:25:04.000000000 -0700 @@ -23,6 +23,7 @@ package com.sun.org.apache.xalan.internal.xsltc.trax; @@ -27463,7 +28193,7 @@ }catch (SAXNotRecognizedException snre ) { throw new TransformerConfigurationException --- ./jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java 2014-07-15 23:25:05.000000000 -0700 @@ -33,6 +33,7 @@ import com.sun.org.apache.xerces.internal.util.PropertyState; import com.sun.org.apache.xerces.internal.util.SymbolTable; @@ -27508,7 +28238,7 @@ new XMLSecurityPropertyManager()); --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/Constants.java 2014-07-15 23:25:04.000000000 -0700 @@ -174,8 +174,6 @@ /** JAXP schemaSource language: when used internally may include DTD namespace (DOM) */ public static final String SCHEMA_LANGUAGE = "schemaLanguage"; @@ -27518,7 +28248,7 @@ /** JAXP Standard property prefix ("http://javax.xml.XMLConstants/property/"). */ public static final String JAXPAPI_PROPERTY_PREFIX = "http://javax.xml.XMLConstants/property/"; -@@ -209,6 +207,107 @@ +@@ -209,6 +207,119 @@ public static final boolean IS_JDK8_OR_ABOVE = isJavaVersionAtLeast(8); // @@ -27567,6 +28297,13 @@ + */ + public static final String JDK_XML_NAME_LIMIT = + ORACLE_JAXP_PROPERTY_PREFIX + "maxXMLNameLimit"; ++ ++ /** ++ * JDK maxElementDepth limit ++ */ ++ public static final String JDK_MAX_ELEMENT_DEPTH = ++ ORACLE_JAXP_PROPERTY_PREFIX + "maxElementDepth"; ++ + /** + * JDK property to allow printing out information from the limit analyzer + */ @@ -27612,6 +28349,11 @@ + */ + public static final String SP_XML_NAME_LIMIT = "jdk.xml.maxXMLNameLimit"; + ++ /** ++ * JDK maxElementDepth limit ++ */ ++ public static final String SP_MAX_ELEMENT_DEPTH = "jdk.xml.maxElementDepth"; ++ + //legacy System Properties + public final static String ENTITY_EXPANSION_LIMIT = "entityExpansionLimit"; + public static final String ELEMENT_ATTRIBUTE_LIMIT = "elementAttributeLimit" ; @@ -27626,7 +28368,7 @@ // DOM features // -@@ -443,7 +542,7 @@ +@@ -443,7 +554,7 @@ public static final String LOCALE_PROPERTY = "locale"; /** property identifier: security manager. */ @@ -27635,7 +28377,7 @@ Constants.XERCES_PROPERTY_PREFIX + Constants.SECURITY_MANAGER_PROPERTY; -@@ -511,9 +610,6 @@ +@@ -511,9 +622,6 @@ */ public final static String ATTRIBUTE_DECLARED = "ATTRIBUTE_DECLARED"; @@ -27646,7 +28388,7 @@ /** * {@link org.w3c.dom.TypeInfo} associated with current element/attribute --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/PropertyManager.java 2014-07-15 23:25:04.000000000 -0700 @@ -25,6 +25,7 @@ package com.sun.org.apache.xerces.internal.impl; @@ -27739,7 +28481,7 @@ if(equivalentProperty != null){ --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java 2014-07-15 23:25:04.000000000 -0700 @@ -108,6 +108,7 @@ * @author Elena Litani, IBM * @author Michael Glavassevich, IBM @@ -27759,7 +28501,7 @@ "ElementAttributeLimit", new Object[]{rawname, new Integer(fElementAttributeLimit) }, --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java 2014-07-15 23:25:04.000000000 -0700 @@ -44,6 +44,9 @@ import com.sun.org.apache.xerces.internal.impl.XMLErrorReporter; import com.sun.org.apache.xerces.internal.impl.XMLEntityHandler; @@ -27903,7 +28645,7 @@ public DTDGrammar getGrammar(){ --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java 2014-07-15 23:25:04.000000000 -0700 @@ -50,12 +50,14 @@ import com.sun.org.apache.xerces.internal.xni.Augmentations; import com.sun.org.apache.xerces.internal.impl.Constants; @@ -28094,7 +28836,15 @@ } // setProperty(String,Object) -@@ -1322,10 +1316,11 @@ +@@ -1315,6 +1309,7 @@ + + fAttributes.removeAllAttributes(); + ++ checkDepth(rawname); + if(!seekCloseOfStartTag()){ + fReadingAttributes = true; + fAttributeCacheUsedCount =0; +@@ -1322,10 +1317,11 @@ fAddDefaultAttr = true; do { scanAttribute(fAttributes); @@ -28108,7 +28858,29 @@ XMLErrorReporter.SEVERITY_FATAL_ERROR ); } -@@ -2036,6 +2031,13 @@ +@@ -1918,6 +1914,21 @@ + // utility methods + + /** ++ * Check if the depth exceeds the maxElementDepth limit ++ * @param elementName name of the current element ++ */ ++ void checkDepth(String elementName) { ++ fLimitAnalyzer.addValue(Limit.MAX_ELEMENT_DEPTH_LIMIT, elementName, fElementStack.fDepth); ++ if (fSecurityManager.isOverLimit(Limit.MAX_ELEMENT_DEPTH_LIMIT,fLimitAnalyzer)) { ++ fSecurityManager.debugPrint(fLimitAnalyzer); ++ reportFatalError("MaxElementDepthLimit", new Object[]{elementName, ++ fLimitAnalyzer.getTotalValue(Limit.MAX_ELEMENT_DEPTH_LIMIT), ++ fSecurityManager.getLimit(Limit.MAX_ELEMENT_DEPTH_LIMIT), ++ "maxElementDepth"}); ++ } ++ } ++ ++ /** + * Calls document handler with a single character resulting from + * built-in entity resolution. + * +@@ -2036,6 +2047,13 @@ } // getDriverName():String @@ -28122,7 +28894,7 @@ String checkAccess(String systemId, String allowedProtocols) throws IOException { String baseSystemId = fEntityScanner.getBaseSystemId(); String expandedSystemId = fEntityManager.expandSystemId(systemId, baseSystemId,fStrictURI); -@@ -2833,6 +2835,8 @@ +@@ -2833,6 +2851,8 @@ if(DEBUG){ System.out.println("NOT USING THE BUFFER, STRING = " + fTempString.toString()); } @@ -28131,7 +28903,7 @@ if(dtdGrammarUtil!= null && dtdGrammarUtil.isIgnorableWhiteSpace(fContentBuffer)){ if(DEBUG)System.out.println("Return SPACE EVENT"); return XMLEvent.SPACE; -@@ -2931,6 +2935,8 @@ +@@ -2931,6 +2951,8 @@ fLastSectionWasCharacterData = true ; continue; }else{ @@ -28140,7 +28912,7 @@ if(dtdGrammarUtil!= null && dtdGrammarUtil.isIgnorableWhiteSpace(fContentBuffer)){ if(DEBUG)System.out.println("Return SPACE EVENT"); return XMLEvent.SPACE; -@@ -3141,6 +3147,30 @@ +@@ -3141,6 +3163,30 @@ } //while loop }//next @@ -28172,7 +28944,7 @@ // // Protected methods --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java 2014-07-15 23:25:04.000000000 -0700 @@ -1090,6 +1090,8 @@ ((XMLDTDScannerImpl)fDTDScanner).reset(fPropertyManager); @@ -28183,7 +28955,7 @@ again = false; switch (fScannerState) { --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java 2014-07-15 23:25:04.000000000 -0700 @@ -18,19 +18,17 @@ * limitations under the License. */ @@ -28343,7 +29115,7 @@ /** --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java 2014-07-15 23:25:04.000000000 -0700 @@ -58,6 +58,7 @@ * @author Neeraj Bajaj, Sun Microsystems * @author Venugopal Rao K, Sun Microsystems @@ -28352,7 +29124,15 @@ */ public class XMLNSDocumentScannerImpl extends XMLDocumentScannerImpl { -@@ -251,10 +252,11 @@ +@@ -219,6 +220,7 @@ + fCurrentElement = fElementQName; + + String rawname = fElementQName.rawname; ++ checkDepth(rawname); + if (fBindNamespaces) { + fNamespaceContext.pushContext(); + if (fScannerState == SCANNER_STATE_ROOT_ELEMENT) { +@@ -251,10 +253,11 @@ do { scanAttribute(fAttributes); @@ -28367,7 +29147,7 @@ } --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java 2013-09-06 11:22:57.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/XMLScanner.java 2014-07-15 23:25:04.000000000 -0700 @@ -32,6 +32,8 @@ import com.sun.org.apache.xerces.internal.util.XMLChar; import com.sun.org.apache.xerces.internal.util.XMLResourceIdentifierImpl; @@ -28494,7 +29274,7 @@ * <p> * <pre> --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties 2013-09-06 11:22:58.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties 2014-07-15 23:25:04.000000000 -0700 @@ -44,6 +44,7 @@ # 2.9 Standalone Document Declaration @@ -28503,7 +29283,7 @@ # 2.12 Language Identification XMLLangInvalid = The xml:lang attribute value \"{0}\" is an invalid language identifier. # 3. Logical Structures -@@ -292,8 +293,10 @@ +@@ -292,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -28515,12 +29295,13 @@ + MaxEntitySizeLimit=JAXP00010003: The length of entity \"{0}\" is \"{1}\" that exceeds the \"{2}\" limit set by \"{3}\". + TotalEntitySizeLimit=JAXP00010004: The accumulated size \"{0}\" of entities exceeded the \"{1}\" limit set by \"{2}\". + MaxXMLNameLimit=JAXP00010005: The name \"{0}\" exceeded the \"{1}\" limit set by \"{2}\". ++ MaxElementDepthLimit=JAXP00010006: The element \"{0}\" has a depth of \"{1}\" that exceeds the limit \"{2}\" set by \"{3}\". -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= Element \"{0}\" has more than \"{1}\" attributes, \"{1}\" is the limit imposed by the application. --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties 2013-12-01 11:13:41.000000000 -0800 -@@ -1,30 +1,27 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties 2014-07-15 23:25:04.000000000 -0700 +@@ -1,31 +1,3 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * @@ -28548,34 +29329,11 @@ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ -+# -+# Copyright (c) 2009, 2013, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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 if you need additional information or have any -+# questions. -+# - +- # This file contains error and warning messages related to XML # The messages are arranged in key and value tuples in a ListResourceBundle. -@@ -48,14 +45,14 @@ + # +@@ -48,14 +20,14 @@ InvalidCharInProlog = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde im Prolog des Dokuments gefunden. InvalidCharInXMLDecl = Ung\u00FCltiges XML-Zeichen (Unicode: 0x{0}) wurde in der XML-Deklaration gefunden. # 2.4 Character Data and Markup @@ -28595,7 +29353,7 @@ VersionInfoRequired = Version ist in der XML-Deklaration erforderlich. SpaceRequiredBeforeVersionInXMLDecl = Leerstelle vor dem Versionspseudoattribut in der XML-Deklaration erforderlich. SpaceRequiredBeforeEncodingInXMLDecl = Leerstelle vor dem Codierungspseudoattribut in der XML-Deklaration erforderlich. -@@ -71,70 +68,71 @@ +@@ -71,70 +43,71 @@ ReferenceIllegalInTrailingMisc=Referenz ist nicht zul\u00E4ssig in angeh\u00E4ngtem Abschnitt. # 2.9 Standalone Document Declaration @@ -28698,7 +29456,7 @@ EncodingDeclRequired = Codierungsdeklaration ist in der Textdeklaration erforderlich. NoMorePseudoAttributes = Es sind keine weiteren Pseudoattribute zul\u00E4ssig. MorePseudoAttributes = Es werden weitere Pseudoattribute erwartet. -@@ -143,13 +141,13 @@ +@@ -143,13 +116,13 @@ CommentNotInOneEntity = Kommentar muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein. PINotInOneEntity = Verarbeitungsanweisung muss vollst\u00E4ndig in derselben geparsten Entit\u00E4t enthalten sein. # 4.3.3 Character Encoding in Entities @@ -28716,7 +29474,7 @@ CharConversionFailure = Eine Entit\u00E4t, f\u00FCr die eine bestimmte Codierung ermittelt wurde, darf keine Sequenzen enthalten, die in dieser Codierung ung\u00FCltig sind. # DTD Messages -@@ -169,135 +167,135 @@ +@@ -169,135 +142,135 @@ PubidCharIllegal = Zeichen (Unicode: 0x{0}) ist nicht zul\u00E4ssig in der \u00F6ffentlichen ID. SpaceRequiredBetweenPublicAndSystem = Leerstellen erforderlich zwischen publicId und systemId. # 2.8 Prolog and Document Type Declaration @@ -28917,7 +29675,7 @@ + NMTOKENInvalid = Attributwert "{0}" mit dem Typ NMTOKEN muss ein Namenstoken sein. + NMTOKENSInvalid = Attributwert "{0}" mit dem Typ NMTOKENS muss mindestens ein Namenstoken sein. + NoNotationOnEmptyElement = Elementtyp "{0}", der als EMPTY deklariert wurde, kann nicht das Attribut "{1}" mit dem Typ NOTATION deklarieren. -+ RootElementTypeMustMatchDoctypedecl = Dokument-Root-Element "{1}"muss mit DOCTYPE-Root "{0}" \u00FCbereinstimmen. ++ RootElementTypeMustMatchDoctypedecl = Document Root-Element "{1}"muss mit DOCTYPE-Root "{0}" \u00FCbereinstimmen. + UndeclaredElementInContentSpec = Contentmodell des Elements "{0}" verweist auf das nicht deklarierte Element "{1}". + UniqueNotationName = Deklaration f\u00FCr die Notation "{0}" ist nicht eindeutig. Ein jeweiliger Name darf nicht in mehreren Notationsdeklarationen deklariert werden. ENTITYFailedInitializeGrammar = ENTITYDatatype-Validator: Nicht erfolgreich. Initialisierungsmethode muss mit einer g\u00FCltigen Grammatikreferenz aufgerufen werden. \t @@ -28950,7 +29708,7 @@ # 4.3.3 Character Encoding in Entities EncodingNotSupported = Codierung "{0}" wird nicht unterst\u00FCtzt. EncodingRequired = Eine nicht in UTF-8 oder UTF-16 codierte geparste Entit\u00E4t muss eine Codierungsdeklaration enthalten. -@@ -305,14 +303,14 @@ +@@ -305,14 +278,14 @@ # Namespaces support # 4. Using Qualified Names IllegalQName = Element oder Attribut stimmt nicht mit QName-Production \u00FCberein: QName::=(NCName':')?NCName. @@ -28971,7 +29729,7 @@ # REVISIT: These need messages MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID -@@ -320,8 +318,10 @@ +@@ -320,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -28983,12 +29741,13 @@ + MaxEntitySizeLimit=JAXP00010003: Die L\u00E4nge von Entit\u00E4t "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde. + TotalEntitySizeLimit=JAXP00010004: Die akkumulierte Gr\u00F6\u00DFe "{0}" der Entit\u00E4ten \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde. + MaxXMLNameLimit=JAXP00010005: Der Name "{0}" \u00FCberschreitet den Grenzwert "{1}", der von "{2}" festgelegt wurde. ++ MaxElementDepthLimit=JAXP00010006: Die Tiefe von Element "{0}" ist "{1}" und \u00FCberschreitet den Grenzwert "{2}", der von "{3}" festgelegt wurde. -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= Element \"{0}\" hat mehr als \"{1}\" Attribute. \"{1}\" ist der durch die Anwendung vorgeschriebene Grenzwert. --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties 2013-12-01 11:13:41.000000000 -0800 -@@ -1,30 +1,27 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties 2014-07-15 23:25:04.000000000 -0700 +@@ -1,31 +1,3 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * @@ -29016,34 +29775,11 @@ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ -+# -+# Copyright (c) 2009, 2013, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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 if you need additional information or have any -+# questions. -+# - +- # This file contains error and warning messages related to XML # The messages are arranged in key and value tuples in a ListResourceBundle. -@@ -48,14 +45,14 @@ + # +@@ -48,14 +20,14 @@ InvalidCharInProlog = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en el pr\u00F3logo del documento. InvalidCharInXMLDecl = Se ha encontrado un car\u00E1cter XML (Unicode: 0x{0}) no v\u00E1lido en la declaraci\u00F3n XML. # 2.4 Character Data and Markup @@ -29063,7 +29799,7 @@ VersionInfoRequired = La versi\u00F3n es necesaria en la declaraci\u00F3n XML. SpaceRequiredBeforeVersionInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo version en la declaraci\u00F3n XML. SpaceRequiredBeforeEncodingInXMLDecl = Es necesario un espacio en blanco antes del pseudo atributo encoding en la declaraci\u00F3n XML. -@@ -71,70 +68,71 @@ +@@ -71,70 +43,71 @@ ReferenceIllegalInTrailingMisc=La referencia no est\u00E1 permitida en la secci\u00F3n final. # 2.9 Standalone Document Declaration @@ -29166,7 +29902,7 @@ EncodingDeclRequired = La declaraci\u00F3n de codificaci\u00F3n es necesaria en la declaraci\u00F3n de texto. NoMorePseudoAttributes = No se permiten m\u00E1s pseudo atributos. MorePseudoAttributes = Se esperan m\u00E1s pseudo atributos. -@@ -143,13 +141,13 @@ +@@ -143,13 +116,13 @@ CommentNotInOneEntity = El comentario debe incluirse totalmente en la misma entidad analizada. PINotInOneEntity = La instrucci\u00F3n de procesamiento debe incluirse totalmente en la misma entidad analizada. # 4.3.3 Character Encoding in Entities @@ -29184,7 +29920,7 @@ CharConversionFailure = Una entidad con una codificaci\u00F3n determinada no debe contener secuencias no permitidas en dicha codificaci\u00F3n. # DTD Messages -@@ -169,150 +167,150 @@ +@@ -169,150 +142,150 @@ PubidCharIllegal = El car\u00E1cter (Unicode: 0x{0}) no est\u00E1 permitido en el identificador p\u00FAblico. SpaceRequiredBetweenPublicAndSystem = Son necesarios espacios en blanco entre publicId y systemId. # 2.8 Prolog and Document Type Declaration @@ -29440,7 +30176,7 @@ # REVISIT: These need messages MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID -@@ -320,8 +318,10 @@ +@@ -320,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -29452,12 +30188,13 @@ + MaxEntitySizeLimit=JAXP00010003: la longitud de la entidad "{0}" es "{1}", que excede el l\u00EDmite de "{2}" que ha definido "{3}". + TotalEntitySizeLimit=JAXP00010004: el tama\u00F1o acumulado "{0}" de las entidades ha excedido el l\u00EDmite de "{1}" que ha definido "{2}". + MaxXMLNameLimit=JAXP00010005: el nombre "{0}" ha excedido el l\u00EDmite de "{1}" que ha definido "{2}". ++ MaxElementDepthLimit=JAXP00010006: El elemento "{0}" tiene una profundidad de "{1}" que excede el l\u00EDmite "{2}" definido por "{3}". -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= El elemento \"{0}\" tiene m\u00E1s de \"{1}\" atributos, \"{1}\" es el l\u00EDmite impuesto por la aplicaci\u00F3n. --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties 2013-12-01 11:13:41.000000000 -0800 -@@ -1,30 +1,27 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties 2014-07-15 23:25:04.000000000 -0700 +@@ -1,31 +1,3 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * @@ -29485,34 +30222,11 @@ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ -+# -+# Copyright (c) 2009, 2013, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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 if you need additional information or have any -+# questions. -+# - +- # This file contains error and warning messages related to XML # The messages are arranged in key and value tuples in a ListResourceBundle. -@@ -48,14 +45,14 @@ + # +@@ -48,14 +20,14 @@ InvalidCharInProlog = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans le prologue du document. InvalidCharInXMLDecl = Un caract\u00E8re XML non valide (Unicode : 0x{0}) a \u00E9t\u00E9 d\u00E9tect\u00E9 dans la d\u00E9claration XML. # 2.4 Character Data and Markup @@ -29532,7 +30246,7 @@ VersionInfoRequired = La version est obligatoire dans la d\u00E9claration XML. SpaceRequiredBeforeVersionInXMLDecl = Un espace est obligatoire devant le pseudo-attribut version dans la d\u00E9claration XML. SpaceRequiredBeforeEncodingInXMLDecl = Un espace est obligatoire devant le pseudo-attribut encoding dans la d\u00E9claration XML. -@@ -71,70 +68,71 @@ +@@ -71,70 +43,71 @@ ReferenceIllegalInTrailingMisc=R\u00E9f\u00E9rence non autoris\u00E9e dans la section de fin. # 2.9 Standalone Document Declaration @@ -29635,7 +30349,7 @@ EncodingDeclRequired = La d\u00E9claration d'encodage est obligatoire dans la d\u00E9claration textuelle. NoMorePseudoAttributes = Aucun autre pseudo-attribut n'est autoris\u00E9. MorePseudoAttributes = D'autres pseudo-attributs sont attendus. -@@ -143,13 +141,13 @@ +@@ -143,13 +116,13 @@ CommentNotInOneEntity = Le commentaire doit \u00EAtre enti\u00E8rement inclus dans la m\u00EAme entit\u00E9 analys\u00E9e. PINotInOneEntity = L'instruction de traitement doit \u00EAtre enti\u00E8rement incluse dans la m\u00EAme entit\u00E9 analys\u00E9e. # 4.3.3 Character Encoding in Entities @@ -29653,7 +30367,7 @@ CharConversionFailure = Une entit\u00E9 respectant un certain encodage ne doit pas contenir de s\u00E9quences non admises dans cet encodage. # DTD Messages -@@ -169,150 +167,150 @@ +@@ -169,150 +142,150 @@ PubidCharIllegal = Ce caract\u00E8re (Unicode : 0x{0}) n''est pas autoris\u00E9 dans l''identificateur public. SpaceRequiredBetweenPublicAndSystem = Des espaces sont obligatoires entre les ID publicId et systemId. # 2.8 Prolog and Document Type Declaration @@ -29910,7 +30624,7 @@ # REVISIT: These need messages MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID -@@ -320,8 +318,10 @@ +@@ -320,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -29922,12 +30636,13 @@ + MaxEntitySizeLimit=JAXP00010003 : La longueur de l''entit\u00E9 "{0}" est de "{1}". Cette valeur d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}". + TotalEntitySizeLimit=JAXP00010004 : La taille cumul\u00E9e des entit\u00E9s ("{0}") d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}". + MaxXMLNameLimit=JAXP00010005 : le nom "{0}" d\u00E9passe la limite de "{1}" d\u00E9finie par "{2}". ++ MaxElementDepthLimit=JAXP00010006 : l''\u00E9l\u00E9ment "{0}" a une profondeur de "{1}" qui d\u00E9passe la limite de "{2}" d\u00E9finie par "{3}". -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= L''\u00E9l\u00E9ment \"{0}\" a plus de \"{1}\" attributs. \"{1}\" est la limite impos\u00E9e par l''application. --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties 2013-12-01 11:13:41.000000000 -0800 -@@ -1,30 +1,27 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties 2014-07-15 23:25:04.000000000 -0700 +@@ -1,31 +1,3 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * @@ -29955,34 +30670,11 @@ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ -+# -+# Copyright (c) 2009, 2013, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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 if you need additional information or have any -+# questions. -+# - +- # This file contains error and warning messages related to XML # The messages are arranged in key and value tuples in a ListResourceBundle. -@@ -48,14 +45,14 @@ + # +@@ -48,14 +20,14 @@ InvalidCharInProlog = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nel prologo del documento. InvalidCharInXMLDecl = \u00C8 stato trovato un carattere XML non valido (Unicode: 0x{0}) nella dichiarazione XML. # 2.4 Character Data and Markup @@ -30002,7 +30694,7 @@ VersionInfoRequired = La versione \u00E8 obbligatoria nella dichiarazione XML. SpaceRequiredBeforeVersionInXMLDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo della versione nella dichiarazione XML. SpaceRequiredBeforeEncodingInXMLDecl = \u00C8 richiesto uno spazio prima dell'attributo pseudo di codifica nella dichiarazione XML. -@@ -71,70 +68,71 @@ +@@ -71,70 +43,71 @@ ReferenceIllegalInTrailingMisc=Il riferimento non \u00E8 consentito nella sezione finale. # 2.9 Standalone Document Declaration @@ -30105,7 +30797,7 @@ EncodingDeclRequired = La dichiarazione di codifica \u00E8 obbligatoria nella dichiarazione di testo. NoMorePseudoAttributes = Non sono consentiti altri attributi pseudo. MorePseudoAttributes = Sono previsti altri attributi pseudo. -@@ -143,13 +141,13 @@ +@@ -143,13 +116,13 @@ CommentNotInOneEntity = Il commento deve essere compreso completamente all'interno della stessa entit\u00E0 analizzata. PINotInOneEntity = L'istruzione di elaborazione deve essere compresa completamente all'interno della stessa entit\u00E0 analizzata. # 4.3.3 Character Encoding in Entities @@ -30123,7 +30815,7 @@ CharConversionFailure = Un'entit\u00E0 che deve trovarsi in una determinata codifica non pu\u00F2 contenere sequenze non valide in quella codifica. # DTD Messages -@@ -169,150 +167,150 @@ +@@ -169,150 +142,150 @@ PubidCharIllegal = Il carattere (Unicode: 0x{0}) non \u00E8 consentito nell''identificativo pubblico. SpaceRequiredBetweenPublicAndSystem = Sono richiesti spazi tra publicId e systemId. # 2.8 Prolog and Document Type Declaration @@ -30379,7 +31071,7 @@ # REVISIT: These need messages MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID -@@ -320,8 +318,10 @@ +@@ -320,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -30391,12 +31083,13 @@ + MaxEntitySizeLimit=JAXP00010003: la lunghezza dell''entit\u00E0 "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}". + TotalEntitySizeLimit=JAXP00010004: le dimensioni accumulate "{0}" delle entit\u00E0 supera il limite "{1}" definito da "{2}". + MaxXMLNameLimit=JAXP00010005: il nome "{0}" supera il limite "{1}" definito da "{2}". ++ MaxElementDepthLimit=JAXP00010006: la profondit\u00E0 dell''elemento "{0}" \u00E8 "{1}". Tale valore supera il limite "{2}" definito da "{3}". -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= L''elemento \"{0}\" contiene pi\u00F9 di \"{1}\" attributi. \"{1}\" \u00E8 il limite imposto dall''applicazione. --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties 2014-01-18 12:16:08.000000000 -0800 -@@ -1,30 +1,26 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties 2014-07-15 23:25:04.000000000 -0700 +@@ -1,31 +1,3 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * @@ -30424,33 +31117,11 @@ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ -+# -+# Copyright (c) 2009, 2013, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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 if you need additional information or have any -+# questions. - +- # This file contains error and warning messages related to XML # The messages are arranged in key and value tuples in a ListResourceBundle. -@@ -48,14 +44,14 @@ + # +@@ -48,14 +20,14 @@ InvalidCharInProlog = \u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u306E\u30D7\u30ED\u30ED\u30FC\u30B0\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002 InvalidCharInXMLDecl = XML\u5BA3\u8A00\u306B\u7121\u52B9\u306AXML\u6587\u5B57(Unicode: 0x{0})\u304C\u898B\u3064\u304B\u308A\u307E\u3057\u305F\u3002 # 2.4 Character Data and Markup @@ -30470,7 +31141,7 @@ VersionInfoRequired = XML\u5BA3\u8A00\u306B\u306F\u30D0\u30FC\u30B8\u30E7\u30F3\u304C\u5FC5\u8981\u3067\u3059\u3002 SpaceRequiredBeforeVersionInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001\u30D0\u30FC\u30B8\u30E7\u30F3\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002 SpaceRequiredBeforeEncodingInXMLDecl = XML\u5BA3\u8A00\u3067\u306F\u3001\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u7591\u4F3C\u5C5E\u6027\u306E\u524D\u306B\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002 -@@ -71,70 +67,71 @@ +@@ -71,70 +43,71 @@ ReferenceIllegalInTrailingMisc=\u5F8C\u7D9A\u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u306F\u53C2\u7167\u3092\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002 # 2.9 Standalone Document Declaration @@ -30573,7 +31244,7 @@ EncodingDeclRequired = \u30C6\u30AD\u30B9\u30C8\u5BA3\u8A00\u306B\u306F\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u5BA3\u8A00\u304C\u5FC5\u8981\u3067\u3059\u3002 NoMorePseudoAttributes = \u3053\u308C\u4EE5\u4E0A\u306E\u7591\u4F3C\u5C5E\u6027\u306F\u6307\u5B9A\u3067\u304D\u307E\u305B\u3093\u3002 MorePseudoAttributes = \u7591\u4F3C\u5C5E\u6027\u304C\u3055\u3089\u306B\u5FC5\u8981\u3067\u3059\u3002 -@@ -143,13 +140,13 @@ +@@ -143,13 +116,13 @@ CommentNotInOneEntity = \u30B3\u30E1\u30F3\u30C8\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 PINotInOneEntity = \u51E6\u7406\u547D\u4EE4\u306F\u3001\u540C\u3058\u89E3\u6790\u6E08\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u5185\u306B\u5B8C\u5168\u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 # 4.3.3 Character Encoding in Entities @@ -30587,11 +31258,11 @@ - OperationNotSupported = \u64CD\u4F5C\"{0}\"\u306F{1}\u30EA\u30FC\u30C0\u30FC\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 - InvalidASCII = \u30D0\u30A4\u30C8\"{0}\"\u306F\u3001(7\u30D3\u30C3\u30C8) ASCII\u30AD\u30E3\u30E9\u30AF\u30BF\u30FB\u30BB\u30C3\u30C8\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 + OperationNotSupported = \u64CD\u4F5C"{0}"\u306F{1}\u30EA\u30FC\u30C0\u30FC\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002 -+ InvalidASCII = \u30D0\u30A4\u30C8"{0}"\u306F\u3001(7\u30D3\u30C3\u30C8) ASCII\u30AD\u30E3\u30E9\u30AF\u30BF\u30FB\u30BB\u30C3\u30C8\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 ++ InvalidASCII = \u30D0\u30A4\u30C8"{0}"\u306F\u3001(7\u30D3\u30C3\u30C8) ASCII\u6587\u5B57\u30BB\u30C3\u30C8\u306E\u30E1\u30F3\u30D0\u30FC\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u3002 CharConversionFailure = \u7279\u5B9A\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u3042\u308B\u3068\u78BA\u5B9A\u3055\u308C\u305F\u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306B\u306F\u3001\u305D\u306E\u30A8\u30F3\u30B3\u30FC\u30C7\u30A3\u30F3\u30B0\u3067\u4E0D\u6B63\u306A\u30B7\u30FC\u30B1\u30F3\u30B9\u3092\u542B\u3081\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002 # DTD Messages -@@ -169,150 +166,150 @@ +@@ -169,150 +142,150 @@ PubidCharIllegal = \u516C\u958B\u8B58\u5225\u5B50\u3067\u306F\u3001\u6587\u5B57(Unicode: 0x{0})\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002 SpaceRequiredBetweenPublicAndSystem = \u516C\u958B\u8B58\u5225\u5B50\u3068\u30B7\u30B9\u30C6\u30E0\u8B58\u5225\u5B50\u306E\u9593\u306B\u306F\u7A7A\u767D\u304C\u5FC5\u8981\u3067\u3059\u3002 # 2.8 Prolog and Document Type Declaration @@ -30848,7 +31519,7 @@ # REVISIT: These need messages MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID -@@ -320,8 +317,10 @@ +@@ -320,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -30860,12 +31531,13 @@ + MaxEntitySizeLimit=JAXP00010003: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3"{0}"\u306E\u9577\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002 + TotalEntitySizeLimit=JAXP00010004: \u30A8\u30F3\u30C6\u30A3\u30C6\u30A3\u306E\u7D2F\u7A4D\u30B5\u30A4\u30BA"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u307E\u3057\u305F\u3002 + MaxXMLNameLimit=JAXP00010005: \u540D\u524D"{0}"\u306F\u3001"{2}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{1}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002 ++ MaxElementDepthLimit=JAXP00010006: \u8981\u7D20"{0}"\u306E\u6DF1\u3055\u306F"{1}"\u3067\u3001"{3}"\u3067\u8A2D\u5B9A\u3055\u308C\u305F\u5236\u9650"{2}"\u3092\u8D85\u3048\u3066\u3044\u307E\u3059\u3002 -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= \u8981\u7D20\"{0}\"\u306B\"{1}\"\u3092\u8D85\u3048\u308B\u5C5E\u6027\u304C\u5B58\u5728\u3057\u307E\u3059\u3002\"{1}\"\u306F\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306B\u3088\u308B\u5236\u9650\u3067\u3059\u3002 --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties 2013-12-01 11:13:41.000000000 -0800 -@@ -1,30 +1,27 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties 2014-07-15 23:25:04.000000000 -0700 +@@ -1,31 +1,3 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * @@ -30893,34 +31565,11 @@ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ -+# -+# Copyright (c) 2009, 2013, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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 if you need additional information or have any -+# questions. -+# - +- # This file contains error and warning messages related to XML # The messages are arranged in key and value tuples in a ListResourceBundle. -@@ -48,14 +45,14 @@ + # +@@ -48,14 +20,14 @@ InvalidCharInProlog = \uBB38\uC11C\uC758 \uD504\uB864\uB85C\uADF8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. InvalidCharInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C \uBD80\uC801\uD569\uD55C XML \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uBC1C\uACAC\uB418\uC5C8\uC2B5\uB2C8\uB2E4. # 2.4 Character Data and Markup @@ -30940,7 +31589,7 @@ VersionInfoRequired = XML \uC120\uC5B8\uC5D0\uB294 \uBC84\uC804\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. SpaceRequiredBeforeVersionInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \uBC84\uC804 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. SpaceRequiredBeforeEncodingInXMLDecl = XML \uC120\uC5B8\uC5D0\uC11C\uB294 \uC778\uCF54\uB529 \uC758\uC0AC \uC18D\uC131 \uC55E\uC5D0 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. -@@ -71,70 +68,71 @@ +@@ -71,70 +43,71 @@ ReferenceIllegalInTrailingMisc=\uD6C4\uD589 \uC139\uC158\uC5D0\uC11C\uB294 \uCC38\uC870\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. # 2.9 Standalone Document Declaration @@ -31043,7 +31692,7 @@ EncodingDeclRequired = \uD14D\uC2A4\uD2B8 \uC120\uC5B8\uC5D0\uB294 \uC778\uCF54\uB529 \uC120\uC5B8\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. NoMorePseudoAttributes = \uC758\uC0AC \uC18D\uC131\uC740 \uB354 \uC774\uC0C1 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. MorePseudoAttributes = \uC758\uC0AC \uC18D\uC131\uC774 \uB354 \uD544\uC694\uD569\uB2C8\uB2E4. -@@ -143,13 +141,13 @@ +@@ -143,13 +116,13 @@ CommentNotInOneEntity = \uC8FC\uC11D\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4. PINotInOneEntity = \uCC98\uB9AC \uBA85\uB839\uC740 \uAD6C\uBB38\uC774 \uBD84\uC11D\uB41C \uB3D9\uC77C\uD55C \uC5D4\uD2F0\uD2F0\uC5D0 \uC644\uC804\uD788 \uD3EC\uD568\uB418\uC5B4\uC57C \uD569\uB2C8\uB2E4. # 4.3.3 Character Encoding in Entities @@ -31061,7 +31710,7 @@ CharConversionFailure = \uD2B9\uC815 \uC778\uCF54\uB529 \uD615\uC2DD\uC774\uC5B4\uC57C \uD558\uB294 \uAC83\uC73C\uB85C \uD655\uC778\uB41C \uC5D4\uD2F0\uD2F0\uC5D0\uB294 \uD574\uB2F9 \uC778\uCF54\uB529\uC5D0 \uBD80\uC801\uD569\uD55C \uC2DC\uD000\uC2A4\uAC00 \uD3EC\uD568\uB418\uC9C0 \uC54A\uC544\uC57C \uD569\uB2C8\uB2E4. # DTD Messages -@@ -169,150 +167,150 @@ +@@ -169,150 +142,150 @@ PubidCharIllegal = \uACF5\uC6A9 \uC2DD\uBCC4\uC790\uC5D0\uB294 \uBB38\uC790(\uC720\uB2C8\uCF54\uB4DC: 0x{0})\uAC00 \uD5C8\uC6A9\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. SpaceRequiredBetweenPublicAndSystem = publicId\uC640 systemId \uC0AC\uC774\uC5D0\uB294 \uACF5\uBC31\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. # 2.8 Prolog and Document Type Declaration @@ -31317,7 +31966,7 @@ # REVISIT: These need messages MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID -@@ -320,8 +318,10 @@ +@@ -320,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -31329,12 +31978,13 @@ + MaxEntitySizeLimit=JAXP00010003: "{0}" \uC5D4\uD2F0\uD2F0\uC758 \uAE38\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uB41C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4. + TotalEntitySizeLimit=JAXP00010004: \uC5D4\uD2F0\uD2F0\uC758 \uB204\uC801 \uD06C\uAE30 "{0}"\uC774(\uAC00) "{2}"\uC5D0\uC11C \uC124\uC815\uB41C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4. + MaxXMLNameLimit=JAXP00010005: "{0}" \uC774\uB984\uC774 "{2}"\uC5D0\uC11C \uC124\uC815\uB41C "{1}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD588\uC2B5\uB2C8\uB2E4. ++ MaxElementDepthLimit=JAXP00010006: "{0}" \uC694\uC18C\uC758 \uAE4A\uC774\uAC00 "{3}"\uC5D0\uC11C \uC124\uC815\uB41C "{2}" \uC81C\uD55C\uC744 \uCD08\uACFC\uD558\uB294 "{1}"\uC785\uB2C8\uB2E4. -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= \"{0}\" \uC694\uC18C\uC5D0 \"{1}\"\uAC1C\uB97C \uCD08\uACFC\uD558\uB294 \uC18D\uC131\uC774 \uC788\uC2B5\uB2C8\uB2E4. \"{1}\"\uC740(\uB294) \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC5D0\uC11C \uC801\uC6A9\uD558\uB294 \uC81C\uD55C\uC785\uB2C8\uB2E4. --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties 2013-12-01 11:13:41.000000000 -0800 -@@ -1,30 +1,27 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties 2014-07-15 23:25:04.000000000 -0700 +@@ -1,31 +1,3 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * @@ -31362,34 +32012,11 @@ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ -+# -+# Copyright (c) 2009, 2013, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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 if you need additional information or have any -+# questions. -+# - +- # This file contains error and warning messages related to XML # The messages are arranged in key and value tuples in a ListResourceBundle. -@@ -48,14 +45,14 @@ + # +@@ -48,14 +20,14 @@ InvalidCharInProlog = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no pr\u00F3logo do documento. InvalidCharInXMLDecl = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na declara\u00E7\u00E3o XML. # 2.4 Character Data and Markup @@ -31409,7 +32036,7 @@ VersionInfoRequired = A vers\u00E3o \u00E9 obrigat\u00F3ria na declara\u00E7\u00E3o XML. SpaceRequiredBeforeVersionInXMLDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes do pseudo-atributo da vers\u00E3o na declara\u00E7\u00E3o XML. SpaceRequiredBeforeEncodingInXMLDecl = O espa\u00E7o em branco \u00E9 necess\u00E1rio antes de codificar o pseudo-atributo na declara\u00E7\u00E3o XML. -@@ -71,85 +68,86 @@ +@@ -71,92 +43,93 @@ ReferenceIllegalInTrailingMisc=A refer\u00EAncia n\u00E3o \u00E9 permitida na se\u00E7\u00E3o \u00E0 esquerda. # 2.9 Standalone Document Declaration @@ -31535,7 +32162,15 @@ CharConversionFailure = Uma entidade destinada a estar em uma determinada codifica\u00E7\u00E3o n\u00E3o deve conter sequ\u00EAncias inv\u00E1lidas na referida codifica\u00E7\u00E3o. # DTD Messages -@@ -169,150 +167,150 @@ + # 2.2 Characters + InvalidCharInEntityValue = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no valor da entidade da literal. + InvalidCharInExternalSubset = Um caractere XML inv\u00E1lido (Unicode: 0x {0}) foi encontrado no subconjunto externo do DTD. +- InvalidCharInIgnoreSect = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na se\u00E7\u00E3o condicional deletada. ++ InvalidCharInIgnoreSect = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado na se\u00E7\u00E3o condicional exclu\u00EDda. + InvalidCharInPublicID = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no identificador p\u00FAblico. + InvalidCharInSystemID = Um caractere XML inv\u00E1lido (Unicode: 0x{0}) foi encontrado no identificador do sistema. + # 2.3 Common Syntactic Constructs +@@ -169,150 +142,150 @@ PubidCharIllegal = O caractere XML (Unicode: 0x{0}) n\u00E3o \u00E9 permitido no identificador p\u00FAblico. SpaceRequiredBetweenPublicAndSystem = Espa\u00E7os em branco s\u00E3o necess\u00E1rios entre publicId e systemId. # 2.8 Prolog and Document Type Declaration @@ -31550,7 +32185,7 @@ MSG_MARKUP_NOT_RECOGNIZED_IN_DTD = As declara\u00E7\u00F5es de marca\u00E7\u00E3o contidas ou apontadas pela declara\u00E7\u00E3o do tipo de documento devem estar corretas. # 2.10 White Space Handling - MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declara\u00E7\u00E3o do atributo para \"xml:space\" como um tipo enumerado, cujo os \u00FAnicos valores poss\u00EDveis s\u00E3o \"default\" e \"preserve\". -+ MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declara\u00E7\u00E3o do atributo para "xml:space" como um tipo enumerado, cujo os \u00FAnicos valores poss\u00EDveis s\u00E3o "default" e "preserve". ++ MSG_XML_SPACE_DECLARATION_ILLEGAL = Deve ser fornecida a declara\u00E7\u00E3o do atributo para "xml:space" como um tipo enumerado, cujo os \u00FAnicos valores poss\u00EDveis s\u00E3o "padr\u00E3o" e "preserve". # 3.2 Element Type Declarations - MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s \"<!ELEMENT\" na declara\u00E7\u00E3o do tipo de elemento. + MSG_SPACE_REQUIRED_BEFORE_ELEMENT_TYPE_IN_ELEMENTDECL = O espa\u00E7o em branco \u00E9 necess\u00E1rio ap\u00F3s "<!ELEMENT" na declara\u00E7\u00E3o do tipo de elemento. @@ -31587,7 +32222,7 @@ + AttNameRequiredInAttDef = O nome do atributo deve ser especificado na declara\u00E7\u00E3o da lista de atributos do elemento "{0}". + MSG_SPACE_REQUIRED_BEFORE_ATTTYPE_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do tipo de atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}". + AttTypeRequiredInAttDef = \u00C9 necess\u00E1rio o tipo de atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}". -+ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do default do atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}". ++ MSG_SPACE_REQUIRED_BEFORE_DEFAULTDECL_IN_ATTDEF = \u00C9 necess\u00E1rio o espa\u00E7o em branco antes do padr\u00E3o do atributo na declara\u00E7\u00E3o do atributo "{1}" do elemento "{0}". + MSG_DUPLICATE_ATTRIBUTE_DEFINITION = Mais de uma defini\u00E7\u00E3o de atributo fornecida para o mesmo atributo "{1}" de um determinado elemento "{0}". # 3.3.1 Attribute Types - MSG_SPACE_REQUIRED_AFTER_NOTATION_IN_NOTATIONTYPE = O espa\u00E7o em branco deve aparecer ap\u00F3s \"NOTATION\" na declara\u00E7\u00E3o do atributo \"{1}\". @@ -31686,7 +32321,7 @@ + DuplicateTypeInMixedContent = O tipo de elemento "{1}" j\u00E1 foi especificado no modelo de conte\u00FAdo da declara\u00E7\u00E3o do elemento "{0}". + ENTITIESInvalid = O valor do atributo "{1}" do tipo ENTITIES deve ser o nome de uma ou mais entidades n\u00E3o submetidas a parsing. + ENTITYInvalid = O valor do atributo "{1}" do tipo ENTITY deve ser o nome de uma entidade n\u00E3o submetida a parsing. -+ IDDefaultTypeInvalid = O atributo do ID "{0}" deve ter um default declarado "#IMPLIED" ou "#REQUIRED". ++ IDDefaultTypeInvalid = O atributo do ID "{0}" deve ter um padr\u00E3o declarado "#IMPLIED" ou "#REQUIRED". + IDInvalid = O valor do atributo "{0}" do ID de tipo deve ser um nome. + IDInvalidWithNamespaces = O valor do atributo "{0}" do ID de tipo deve ser um NCName quando os namespaces estiverem ativados. + IDNotUnique = O valor do atributo "{0}" do ID de tipo deve ser exclusivo no documento. @@ -31703,7 +32338,7 @@ + MSG_CONTENT_INCOMPLETE = O conte\u00FAdo do tipo de elemento "{0}" est\u00E1 incompleto; ele deve corresponder a "{1}". + MSG_CONTENT_INVALID = O conte\u00FAdo do tipo de elemento "{0}" deve corresponder a "{1}". + MSG_CONTENT_INVALID_SPECIFIED = O conte\u00FAdo do tipo de elemento "{0}" deve corresponder a "{1}". N\u00E3o s\u00E3o permitidos os filhos do tipo "{2}". -+ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" do tipo de elemento "{0}" tem um valor default e deve ser especificado em um documento stand-alone. ++ MSG_DEFAULTED_ATTRIBUTE_NOT_SPECIFIED = O atributo "{1}" do tipo de elemento "{0}" tem um valor padr\u00E3o e deve ser especificado em um documento stand-alone. + MSG_DUPLICATE_ATTDEF = O atributo "{1}" j\u00E1 foi declarado para o tipo de elemento "{0}". + MSG_ELEMENT_ALREADY_DECLARED = O tipo de elemento "{0}" n\u00E3o deve ser declarado mais de uma vez. + MSG_ELEMENT_NOT_DECLARED = O tipo de elemento "{0}" deve ser declarado. @@ -31793,7 +32428,7 @@ # REVISIT: These need messages MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID -@@ -320,8 +318,10 @@ +@@ -320,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -31805,12 +32440,13 @@ + MaxEntitySizeLimit=JAXP00010003: o tamanho da entidade "{0}" \u00E9 "{1}", o que excede o limite de "{2}" definido por "{3}". + TotalEntitySizeLimit=JAXP00010004: o tamanho acumulado "{0}" de entidades excedeu o limite de "{1}" definido por "{2}". + MaxXMLNameLimit=JAXP00010005: o nome "{0}" excedeu o limite de "{1}" definido por "{2}". ++ MaxElementDepthLimit=JAXP00010006: o elemento "{0}" tem uma profundidade de "{1}" que excede o limite de "{2}" definido por "{3}". -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= O elemento \"{0}\" tem mais de \"{1}\" atributos. \"{1}\" \u00E9 o limite imposto pela aplica\u00E7\u00E3o. --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties 2013-12-01 11:13:41.000000000 -0800 -@@ -1,30 +1,27 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties 2014-07-15 23:25:04.000000000 -0700 +@@ -1,31 +1,3 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * @@ -31838,34 +32474,20 @@ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ -+# -+# Copyright (c) 2009, 2013, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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 if you need additional information or have any -+# questions. -+# - +- # This file contains error and warning messages related to XML # The messages are arranged in key and value tuples in a ListResourceBundle. -@@ -48,14 +45,14 @@ + # +@@ -35,7 +7,7 @@ + FormatFailed = Ett internt fel intr\u00E4ffade vid formatering av f\u00F6ljande meddelande:\n + + # Document messages +- PrematureEOF=F\u00F6r tidigt filslut (EOF). ++ PrematureEOF=Filen har avslutats f\u00F6r tidigt. + # 2.1 Well-Formed XML Documents + RootElementRequired = Rotelementet kr\u00E4vs i ett v\u00E4lformulerat dokument. + # 2.2 Characters +@@ -48,14 +20,14 @@ InvalidCharInProlog = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i dokumentets prolog. InvalidCharInXMLDecl = Ett ogiltigt XML-tecken (Unicode: 0x{0}) hittades i XML-deklarationen. # 2.4 Character Data and Markup @@ -31885,7 +32507,7 @@ VersionInfoRequired = Versionen kr\u00E4vs i XML-deklarationen. SpaceRequiredBeforeVersionInXMLDecl = Tomt utrymme kr\u00E4vs f\u00F6re versionens pseudoattribut i XML-deklarationen. SpaceRequiredBeforeEncodingInXMLDecl = Tomt utrymme kr\u00E4vs f\u00F6re kodningens pseudoattribut i XML-deklarationen. -@@ -71,70 +68,71 @@ +@@ -71,70 +43,71 @@ ReferenceIllegalInTrailingMisc=Referensen \u00E4r inte till\u00E5ten i efterf\u00F6ljande avsnitt. # 2.9 Standalone Document Declaration @@ -31989,7 +32611,7 @@ EncodingDeclRequired = Koddeklaration kr\u00E4vs i textdeklarationen. NoMorePseudoAttributes = Inga fler pseudoattribut \u00E4r till\u00E5tna. MorePseudoAttributes = Ytterligare pseudoattribut f\u00F6rv\u00E4ntas. -@@ -143,13 +141,13 @@ +@@ -143,13 +116,13 @@ CommentNotInOneEntity = Kommentaren m\u00E5ste finnas med inom samma tolkade enhet. PINotInOneEntity = Bearbetningsinstruktionen m\u00E5ste finnas med inom samma tolkade enhet. # 4.3.3 Character Encoding in Entities @@ -32007,7 +32629,7 @@ CharConversionFailure = En enhet som fastst\u00E4lls anv\u00E4nda ett visst kodformat f\u00E5r inte inneh\u00E5lla sekvenser som \u00E4r otill\u00E5tna i kodningen. # DTD Messages -@@ -169,150 +167,150 @@ +@@ -169,150 +142,150 @@ PubidCharIllegal = Tecknet (Unicode: 0x{0}) \u00E4r inte till\u00E5tet i den allm\u00E4nna identifieraren. SpaceRequiredBetweenPublicAndSystem = Tomma utrymmen kr\u00E4vs mellan publicId och systemId. # 2.8 Prolog and Document Type Declaration @@ -32263,7 +32885,7 @@ # REVISIT: These need messages MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID -@@ -320,8 +318,10 @@ +@@ -320,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -32275,12 +32897,13 @@ + MaxEntitySizeLimit=JAXP00010003: L\u00E4ngden p\u00E5 enheten "{0}" \u00E4r "{1}" som \u00F6verskriver gr\u00E4nsv\u00E4rdet p\u00E5 "{2}" som anges av "{3}". + TotalEntitySizeLimit=JAXP00010004: Den ackumulerade storleken "{0}" f\u00F6r enheter \u00F6verskred gr\u00E4nsv\u00E4rdet p\u00E5 "{1}" som anges av "{2}". + MaxXMLNameLimit=JAXP00010005: Namnet "{0}" \u00F6verskred gr\u00E4nsv\u00E4rdet p\u00E5 "{1}" som anges av "{2}". ++ MaxElementDepthLimit=JAXP00010006: Elementet "{0}" har djupet "{1}" vilket \u00E4r st\u00F6rre \u00E4n gr\u00E4nsen "{2}" som anges av "{3}". -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= Elementet \"{0}\" har fler \u00E4n \"{1}\" attribut, \"{1}\" \u00E4r applikationens gr\u00E4nsv\u00E4rde. --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties 2013-12-01 11:13:41.000000000 -0800 -@@ -1,30 +1,26 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties 2014-07-15 23:25:04.000000000 -0700 +@@ -1,31 +1,3 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * @@ -32308,33 +32931,11 @@ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ -+# -+# Copyright (c) 2009, 2013, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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 if you need additional information or have any -+# questions. - +- # This file contains error and warning messages related to XML # The messages are arranged in key and value tuples in a ListResourceBundle. -@@ -48,14 +44,14 @@ + # +@@ -48,14 +20,14 @@ InvalidCharInProlog = \u5728\u6587\u6863\u524D\u8A00\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002 InvalidCharInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u627E\u5230\u65E0\u6548\u7684 XML \u5B57\u7B26 (Unicode: 0x{0})\u3002 # 2.4 Character Data and Markup @@ -32354,7 +32955,7 @@ VersionInfoRequired = XML \u58F0\u660E\u4E2D\u9700\u8981\u6B64\u7248\u672C\u3002 SpaceRequiredBeforeVersionInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u7684\u7248\u672C\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002 SpaceRequiredBeforeEncodingInXMLDecl = \u5728 XML \u58F0\u660E\u4E2D\u7684\u7F16\u7801\u4F2A\u5C5E\u6027\u524D\u9762\u5FC5\u987B\u6709\u7A7A\u683C\u3002 -@@ -71,85 +67,86 @@ +@@ -71,85 +43,86 @@ ReferenceIllegalInTrailingMisc=\u5C3E\u968F\u8282\u4E2D\u4E0D\u5141\u8BB8\u6709\u5F15\u7528\u3002 # 2.9 Standalone Document Declaration @@ -32480,7 +33081,7 @@ CharConversionFailure = \u786E\u5B9A\u5C5E\u4E8E\u67D0\u4E2A\u7F16\u7801\u7684\u5B9E\u4F53\u4E0D\u80FD\u5305\u542B\u5728\u8BE5\u7F16\u7801\u4E2D\u975E\u6CD5\u7684\u5E8F\u5217\u3002 # DTD Messages -@@ -169,150 +166,150 @@ +@@ -169,150 +142,150 @@ PubidCharIllegal = \u516C\u5171\u6807\u8BC6\u7B26\u4E2D\u4E0D\u5141\u8BB8\u4F7F\u7528\u8BE5\u5B57\u7B26 (Unicode: 0x{0})\u3002 SpaceRequiredBetweenPublicAndSystem = \u5728 publicId \u548C systemId \u4E4B\u95F4\u9700\u8981\u6709\u7A7A\u683C\u3002 # 2.8 Prolog and Document Type Declaration @@ -32738,7 +33339,7 @@ # REVISIT: These need messages MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID -@@ -320,8 +317,10 @@ +@@ -320,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -32750,12 +33351,13 @@ + MaxEntitySizeLimit=JAXP00010003: \u5B9E\u4F53 "{0}" \u7684\u957F\u5EA6\u4E3A "{1}", \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684 "{2}" \u9650\u5236\u3002 + TotalEntitySizeLimit=JAXP00010004: \u5B9E\u4F53\u7684\u7D2F\u8BA1\u5927\u5C0F "{0}" \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002 + MaxXMLNameLimit=JAXP00010005: \u540D\u79F0 "{0}" \u8D85\u8FC7\u4E86 "{2}" \u8BBE\u7F6E\u7684 "{1}" \u9650\u5236\u3002 ++ MaxElementDepthLimit=JAXP00010006: \u5143\u7D20 "{0}" \u7684\u6DF1\u5EA6 "{1}" \u8D85\u8FC7\u4E86 "{3}" \u8BBE\u7F6E\u7684\u9650\u5236 "{2}"\u3002 -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= \u5143\u7D20 \"{0}\" \u5177\u6709\u591A\u4E2A \"{1}\" \u5C5E\u6027, \"{1}\" \u662F\u5E94\u7528\u7A0B\u5E8F\u65BD\u52A0\u7684\u9650\u5236\u3002 --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties 2013-12-01 11:13:41.000000000 -0800 -@@ -1,30 +1,27 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties 2014-07-15 23:25:04.000000000 -0700 +@@ -1,31 +1,3 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * @@ -32783,34 +33385,11 @@ -/* - * Copyright (c) 2009 by Oracle Corporation. All Rights Reserved. - */ -+# -+# Copyright (c) 2009, 2013, 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. Oracle designates this -+# particular file as subject to the "Classpath" exception as provided -+# by Oracle in the LICENSE file that accompanied this code. -+# -+# 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 if you need additional information or have any -+# questions. -+# - +- # This file contains error and warning messages related to XML # The messages are arranged in key and value tuples in a ListResourceBundle. -@@ -48,14 +45,14 @@ + # +@@ -48,14 +20,14 @@ InvalidCharInProlog = \u5728\u6587\u4EF6\u5BA3\u544A\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002 InvalidCharInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002 # 2.4 Character Data and Markup @@ -32830,7 +33409,7 @@ VersionInfoRequired = XML \u5BA3\u544A\u4E2D\u9700\u8981\u7248\u672C\u3002 SpaceRequiredBeforeVersionInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\u7248\u672C\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002 SpaceRequiredBeforeEncodingInXMLDecl = \u5728 XML \u5BA3\u544A\u4E2D\uFF0C\u7DE8\u78BC\u865B\u64EC\u5C6C\u6027\u4E4B\u524D\u9700\u8981\u6709\u7A7A\u683C\u3002 -@@ -71,90 +68,91 @@ +@@ -71,90 +43,91 @@ ReferenceIllegalInTrailingMisc=\u5C3E\u7AEF\u6BB5\u843D\u4E2D\u4E0D\u5141\u8A31\u53C3\u7167\u3002 # 2.9 Standalone Document Declaration @@ -32968,7 +33547,7 @@ InvalidCharInExternalSubset = \u5728 DTD \u5916\u90E8\u5B50\u96C6\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002 InvalidCharInIgnoreSect = \u5728\u6392\u9664\u7684\u689D\u4EF6\u6027\u6BB5\u843D\u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002 InvalidCharInPublicID = \u5728\u516C\u7528 ID \u4E2D\u627E\u5230\u7121\u6548\u7684 XML \u5B57\u5143 (Unicode: 0x{0})\u3002 -@@ -169,150 +167,150 @@ +@@ -169,150 +142,150 @@ PubidCharIllegal = \u516C\u7528 ID \u4E2D\u4E0D\u5141\u8A31\u5B57\u5143 (Unicode: 0x{0})\u3002 SpaceRequiredBetweenPublicAndSystem = publicId \u8207 systemId \u4E4B\u9593\u9700\u8981\u7A7A\u683C\u3002 # 2.8 Prolog and Document Type Declaration @@ -33229,7 +33808,7 @@ # REVISIT: These need messages MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID=MSG_SPACE_REQUIRED_AFTER_SYSTEMLITERAL_IN_EXTERNALID -@@ -320,8 +318,10 @@ +@@ -320,8 +293,11 @@ InvalidCharInLiteral=InvalidCharInLiteral @@ -33241,11 +33820,12 @@ + MaxEntitySizeLimit=JAXP00010003: \u5BE6\u9AD4 "{0}" \u7684\u9577\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u6240\u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002 + TotalEntitySizeLimit=JAXP00010004: \u5BE6\u9AD4\u7684\u7D2F\u7A4D\u5927\u5C0F "{0}" \u8D85\u904E "{2}" \u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002 + MaxXMLNameLimit=JAXP00010005: \u540D\u7A31 "{0}" \u8D85\u904E "{2}" \u8A2D\u5B9A\u7684 "{1}" \u9650\u5236\u3002 ++ MaxElementDepthLimit=JAXP00010006: \u5143\u7D20 "{0}" \u7684\u6DF1\u5EA6\u70BA "{1}"\uFF0C\u8D85\u904E "{3}" \u8A2D\u5B9A\u7684 "{2}" \u9650\u5236\u3002 -# Application can set the limit of number of attributes of entity that should be expanded by the parser. -ElementAttributeLimit= \u5143\u7D20 \"{0}\" \u5177\u6709\u8D85\u904E \"{1}\" \u500B\u4EE5\u4E0A\u7684\u5C6C\u6027\uFF0C\"{1}\" \u70BA\u61C9\u7528\u7A0B\u5F0F\u6240\u898F\u5B9A\u7684\u9650\u5236\u3002 --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xpath/XPath.java 2014-07-15 23:25:04.000000000 -0700 @@ -1422,7 +1422,7 @@ } ch = data.charAt(currentOffset); @@ -33256,7 +33836,7 @@ starIsMultiplyOperator = true; break; --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java 2014-07-15 23:25:04.000000000 -0700 @@ -21,13 +21,13 @@ package com.sun.org.apache.xerces.internal.impl.xs.models; @@ -33320,7 +33900,7 @@ } if (suffixLength == Constants.ERROR_REPORTER_PROPERTY.length() && --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java 2014-07-15 23:25:04.000000000 -0700 @@ -40,6 +40,7 @@ import com.sun.org.apache.xerces.internal.util.SymbolTable; import com.sun.org.apache.xerces.internal.util.XMLChar; @@ -33341,7 +33921,7 @@ // reset max values in case processing continues on error --- ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2013-09-06 11:22:59.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java 2014-07-15 23:25:04.000000000 -0700 @@ -70,7 +70,6 @@ import com.sun.org.apache.xerces.internal.util.DefaultErrorHandler; import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper; @@ -33396,7 +33976,7 @@ //set entity resolver --- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java 2014-07-15 23:25:05.000000000 -0700 @@ -20,6 +20,8 @@ package com.sun.org.apache.xerces.internal.jaxp; @@ -33433,7 +34013,7 @@ String systemId = e.getSystemId(); --- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java 2014-07-15 23:25:05.000000000 -0700 @@ -36,7 +36,7 @@ import com.sun.org.apache.xerces.internal.impl.xs.XMLSchemaValidator; import com.sun.org.apache.xerces.internal.jaxp.validation.XSGrammarPoolContainer; @@ -33554,7 +34134,7 @@ } --- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java 2014-07-15 23:25:05.000000000 -0700 @@ -20,22 +20,13 @@ package com.sun.org.apache.xerces.internal.jaxp; @@ -33790,7 +34370,7 @@ throws SAXNotRecognizedException, SAXNotSupportedException { try { --- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java 2014-07-15 23:25:05.000000000 -0700 @@ -26,6 +26,7 @@ package com.sun.org.apache.xerces.internal.jaxp.validation; @@ -33820,7 +34400,7 @@ identityTransformer2 = tf.newTransformerHandler(); } catch (TransformerConfigurationException e) { --- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java 2014-07-15 23:25:05.000000000 -0700 @@ -20,28 +20,27 @@ package com.sun.org.apache.xerces.internal.jaxp.validation; @@ -33895,7 +34475,7 @@ return config; } --- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java 2014-07-15 23:25:05.000000000 -0700 @@ -49,10 +49,10 @@ import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter; import com.sun.org.apache.xerces.internal.util.Status; @@ -33923,7 +34503,7 @@ try { reader.setProperty(SECURITY_MANAGER, securityManager); --- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java 2014-07-15 23:25:05.000000000 -0700 @@ -41,10 +41,10 @@ import com.sun.org.apache.xerces.internal.util.ErrorHandlerWrapper; import com.sun.org.apache.xerces.internal.util.SAXInputSource; @@ -34051,7 +34631,7 @@ } catch (XMLConfigurationException e) { --- ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java 2014-07-15 23:25:05.000000000 -0700 @@ -39,9 +39,9 @@ import com.sun.org.apache.xerces.internal.util.NamespaceSupport; import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings; @@ -34158,7 +34738,7 @@ /** --- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java 2014-07-15 23:25:05.000000000 -0700 @@ -20,18 +20,15 @@ package com.sun.org.apache.xerces.internal.parsers; @@ -34239,7 +34819,7 @@ // // Default handling --- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/DOMParser.java 2014-07-15 23:25:05.000000000 -0700 @@ -29,6 +29,7 @@ import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter; import com.sun.org.apache.xerces.internal.util.Status; @@ -34304,7 +34884,7 @@ fConfiguration.setProperty(propertyId, value); } --- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java 2014-07-15 23:25:05.000000000 -0700 @@ -38,7 +38,6 @@ import com.sun.org.apache.xerces.internal.util.PropertyState; import com.sun.org.apache.xerces.internal.util.Status; @@ -34341,7 +34921,7 @@ // --- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java 2014-07-15 23:25:05.000000000 -0700 @@ -36,7 +36,6 @@ import com.sun.org.apache.xerces.internal.util.PropertyState; import com.sun.org.apache.xerces.internal.util.Status; @@ -34378,7 +34958,7 @@ // --- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/SAXParser.java 2014-07-15 23:25:05.000000000 -0700 @@ -22,6 +22,7 @@ import com.sun.org.apache.xerces.internal.impl.Constants; @@ -34450,7 +35030,7 @@ } } // class SAXParser --- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java 2014-07-15 23:25:05.000000000 -0700 @@ -23,8 +23,8 @@ import com.sun.org.apache.xerces.internal.impl.Constants; import com.sun.org.apache.xerces.internal.xni.grammars.XMLGrammarPool; @@ -34479,7 +35059,7 @@ } // class SecurityConfiguration --- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/XML11Configuration.java 2014-07-15 23:25:05.000000000 -0700 @@ -52,6 +52,7 @@ import com.sun.org.apache.xerces.internal.util.ParserConfigurationSettings; import com.sun.org.apache.xerces.internal.util.PropertyState; @@ -34630,7 +35210,7 @@ if (fErrorReporter.getMessageFormatter(XMLMessageFormatter.XML_DOMAIN) == null) { XMLMessageFormatter xmft = new XMLMessageFormatter(); --- ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/parsers/XMLParser.java 2014-07-15 23:25:05.000000000 -0700 @@ -23,6 +23,8 @@ import java.io.IOException; @@ -34671,7 +35251,7 @@ reset(); fConfiguration.parse(inputSource); --- ./jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/util/SecurityManager.java 2014-07-15 23:25:05.000000000 -0700 @@ -61,8 +61,6 @@ package com.sun.org.apache.xerces.internal.util; @@ -34770,7 +35350,7 @@ - } } // class SecurityManager --- ./jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/util/SymbolTable.java 2014-07-15 23:25:05.000000000 -0700 @@ -173,7 +173,7 @@ for (int i = 0; i < length; i++) { code = code * 37 + symbol.charAt(i); @@ -34790,7 +35370,7 @@ } // hash(char[],int,int):int --- ./jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/util/URI.java 2014-07-15 23:25:05.000000000 -0700 @@ -689,9 +689,13 @@ if (!initializeAuthority(uriSpec.substring(startPos, index))) { index = startPos - 2; @@ -34808,7 +35388,7 @@ } --- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java 2014-04-19 01:27:01.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/ObjectFactory.java 2014-07-15 23:25:04.000000000 -0700 @@ -48,7 +48,8 @@ // // Constants @@ -34853,7 +35433,7 @@ try { providerClass = cl.loadClass(className); --- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/SecuritySupport.java 2014-07-15 23:25:04.000000000 -0700 @@ -211,7 +211,7 @@ if (i > 0) { return uri.substring(i+1, uri.length()); @@ -34864,8 +35444,8 @@ /** --- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2014-01-18 12:16:08.000000000 -0800 -@@ -0,0 +1,237 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java 2014-07-15 23:25:04.000000000 -0700 +@@ -0,0 +1,241 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * @@ -35000,6 +35580,10 @@ + totalValue[index] += value; + return; + } ++ if (index == Limit.MAX_ELEMENT_DEPTH_LIMIT.ordinal()) { ++ totalValue[index] = value; ++ return; ++ } + + Map<String, Integer> cache; + if (caches[index] == null) { @@ -35104,8 +35688,8 @@ + } +} --- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2014-01-18 12:16:08.000000000 -0800 -@@ -0,0 +1,540 @@ ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java 2014-07-15 23:25:04.000000000 -0700 +@@ -0,0 +1,542 @@ +/* + * Copyright (c) 2013 Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35174,7 +35758,8 @@ + ELEMENT_ATTRIBUTE_LIMIT(Constants.JDK_ELEMENT_ATTRIBUTE_LIMIT, Constants.SP_ELEMENT_ATTRIBUTE_LIMIT, 0, 10000), + TOTAL_ENTITY_SIZE_LIMIT(Constants.JDK_TOTAL_ENTITY_SIZE_LIMIT, Constants.SP_TOTAL_ENTITY_SIZE_LIMIT, 0, 50000000), + GENEAL_ENTITY_SIZE_LIMIT(Constants.JDK_GENEAL_ENTITY_SIZE_LIMIT, Constants.SP_GENEAL_ENTITY_SIZE_LIMIT, 0, 0), -+ PARAMETER_ENTITY_SIZE_LIMIT(Constants.JDK_PARAMETER_ENTITY_SIZE_LIMIT, Constants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000); ++ PARAMETER_ENTITY_SIZE_LIMIT(Constants.JDK_PARAMETER_ENTITY_SIZE_LIMIT, Constants.SP_PARAMETER_ENTITY_SIZE_LIMIT, 0, 1000000), ++ MAX_ELEMENT_DEPTH_LIMIT(Constants.JDK_MAX_ELEMENT_DEPTH, Constants.SP_MAX_ELEMENT_DEPTH, 0, 0); + + final String apiProperty; + final String systemProperty; @@ -35537,9 +36122,10 @@ + return false; + } + -+ if (index==Limit.ELEMENT_ATTRIBUTE_LIMIT.ordinal() || -+ index==Limit.ENTITY_EXPANSION_LIMIT.ordinal() || -+ index==Limit.TOTAL_ENTITY_SIZE_LIMIT.ordinal()) { ++ if (index == Limit.ELEMENT_ATTRIBUTE_LIMIT.ordinal() || ++ index == Limit.ENTITY_EXPANSION_LIMIT.ordinal() || ++ index == Limit.TOTAL_ENTITY_SIZE_LIMIT.ordinal() || ++ index == Limit.MAX_ELEMENT_DEPTH_LIMIT.ordinal()) { + return (limitAnalyzer.getTotalValue(index) > values[index]); + } else { + return (limitAnalyzer.getValue(index) > values[index]); @@ -35647,7 +36233,7 @@ + } +} --- ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java 2014-07-15 23:25:04.000000000 -0700 @@ -91,6 +91,24 @@ readSystemProperties(); } @@ -35698,7 +36284,7 @@ * Return the value of the specified property * --- ./jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java 2013-09-06 11:23:00.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java 2014-07-15 23:25:05.000000000 -0700 @@ -37,7 +37,6 @@ import com.sun.org.apache.xerces.internal.util.HTTPInputSource; import com.sun.org.apache.xerces.internal.util.IntStack; @@ -35745,7 +36331,7 @@ fChildConfig.setProperty(propertyId, value); } --- ./jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java 2013-09-06 11:23:01.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java 2014-07-15 23:25:05.000000000 -0700 @@ -20,6 +20,7 @@ package com.sun.org.apache.xerces.internal.xni.parser; @@ -35761,7 +36347,7 @@ + public void setLimitAnalyzer(XMLLimitAnalyzer limitAnalyzer); } // interface XMLDTDScanner --- ./jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java 2013-09-06 11:23:01.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java 2014-07-15 23:25:05.000000000 -0700 @@ -105,15 +105,15 @@ */ public Node item(int index) { @@ -35782,7 +36368,7 @@ count++; } --- ./jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java 2013-09-06 11:23:02.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xml/internal/resolver/CatalogManager.java 2014-07-15 23:25:05.000000000 -0700 @@ -24,20 +24,17 @@ package com.sun.org.apache.xml.internal.resolver; @@ -35818,7 +36404,7 @@ debug.message(1,"Catalog class named '" + catalogClassName --- ./jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2013-09-06 11:23:02.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java 2014-07-15 23:25:05.000000000 -0700 @@ -23,24 +23,21 @@ package com.sun.org.apache.xml.internal.resolver.readers; @@ -35862,7 +36448,7 @@ catalog.getCatalogManager().debug.message(1, "Cannot load XML Catalog Parser class", domParserClass); throw new CatalogException(CatalogException.UNPARSEABLE); --- ./jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2013-09-06 11:23:02.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2014-01-18 12:16:08.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java 2014-07-15 23:25:05.000000000 -0700 @@ -23,19 +23,21 @@ package com.sun.org.apache.xml.internal.resolver.readers; @@ -35933,7 +36519,7 @@ saxParser.setCatalog(catalog); saxParser.startDocument(); --- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java 2013-09-06 11:23:02.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java 2014-04-19 01:27:01.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/CharInfo.java 2014-07-15 23:25:05.000000000 -0700 @@ -22,6 +22,11 @@ */ package com.sun.org.apache.xml.internal.serializer; @@ -36148,7 +36734,7 @@ /** Table of user-specified char infos. */ --- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java 2013-09-06 11:23:02.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java 2014-04-19 01:27:01.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/ToHTMLStream.java 2014-07-15 23:25:05.000000000 -0700 @@ -60,7 +60,7 @@ */ private static final CharInfo m_htmlcharInfo = @@ -36159,7 +36745,7 @@ /** A digital search trie for fast, case insensitive lookup of ElemDesc objects. */ static final Trie m_elementFlags = new Trie(); --- ./jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java 2013-09-06 11:23:02.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java 2014-04-19 01:27:01.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xml/internal/serializer/ToXMLStream.java 2014-07-15 23:25:05.000000000 -0700 @@ -58,7 +58,7 @@ */ private static CharInfo m_xmlcharInfo = @@ -36170,7 +36756,7 @@ /** * Default constructor. --- ./jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java 2013-09-06 11:23:03.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/com/sun/org/apache/xml/internal/utils/XMLReaderManager.java 2014-07-15 23:25:05.000000000 -0700 @@ -25,12 +25,15 @@ import com.sun.org.apache.xalan.internal.XalanConstants; import com.sun.org.apache.xalan.internal.utils.FactoryImpl; @@ -36277,7 +36863,7 @@ } } --- ./jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java 2013-09-06 11:23:03.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xpath/internal/XPathContext.java 2014-07-15 23:25:05.000000000 -0700 @@ -103,8 +103,7 @@ * the DTMManager, it really is a proxy for this object, which * is the real DTMManager. @@ -36289,7 +36875,7 @@ /** * Return the DTMManager object. Though XPathContext context extends --- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java 2013-09-06 11:23:03.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java 2014-07-15 23:25:05.000000000 -0700 @@ -33,6 +33,7 @@ import com.sun.org.apache.xpath.internal.objects.XNodeSet; import com.sun.org.apache.xpath.internal.res.XPATHErrorResources; @@ -36314,7 +36900,7 @@ /** --- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java 2013-09-06 11:23:03.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java 2014-07-15 23:25:05.000000000 -0700 @@ -30,6 +30,7 @@ import com.sun.org.apache.xpath.internal.res.XPATHErrorResources; import com.sun.org.apache.xalan.internal.res.XSLMessages; @@ -36380,7 +36966,7 @@ } else { xpathSupport = new com.sun.org.apache.xpath.internal.XPathContext(); --- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java 2013-09-06 11:23:04.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java 2014-07-15 23:25:05.000000000 -0700 @@ -24,6 +24,8 @@ import com.sun.org.apache.xalan.internal.XalanConstants; import com.sun.org.apache.xpath.internal.res.XPATHErrorResources; @@ -36461,7 +37047,7 @@ String fmsg = XSLMessages.createXPATHMessage( XPATHErrorResources.ER_GETTING_UNKNOWN_FEATURE, --- ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java 2013-09-06 11:23:04.000000000 -0700 -+++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/com/sun/org/apache/xpath/internal/jaxp/XPathImpl.java 2014-07-15 23:25:05.000000000 -0700 @@ -35,6 +35,7 @@ import com.sun.org.apache.xpath.internal.res.XPATHErrorResources; import com.sun.org.apache.xalan.internal.res.XSLMessages; @@ -36513,7 +37099,7 @@ } catch ( javax.xml.transform.TransformerException te ) { throw new XPathExpressionException ( te ) ; --- ./jaxp/src/javax/xml/stream/FactoryFinder.java 2013-09-06 11:23:04.000000000 -0700 -+++ ./jaxp/src/javax/xml/stream/FactoryFinder.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/javax/xml/stream/FactoryFinder.java 2014-07-15 23:25:05.000000000 -0700 @@ -204,13 +204,15 @@ * a property name * @param fallbackClassName Implementation class name, if nothing else @@ -36571,7 +37157,7 @@ // Try read $java.home/lib/stax.properties followed by --- ./jaxp/src/javax/xml/stream/XMLEventFactory.java 2013-09-06 11:23:04.000000000 -0700 -+++ ./jaxp/src/javax/xml/stream/XMLEventFactory.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/javax/xml/stream/XMLEventFactory.java 2014-07-15 23:25:05.000000000 -0700 @@ -60,9 +60,7 @@ public static XMLEventFactory newInstance() throws FactoryConfigurationError @@ -36615,7 +37201,7 @@ throw new FactoryConfigurationError(e.getException(), e.getMessage()); --- ./jaxp/src/javax/xml/stream/XMLInputFactory.java 2013-09-06 11:23:04.000000000 -0700 -+++ ./jaxp/src/javax/xml/stream/XMLInputFactory.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/javax/xml/stream/XMLInputFactory.java 2014-07-15 23:25:05.000000000 -0700 @@ -139,6 +139,7 @@ public static final String ALLOCATOR= "javax.xml.stream.allocator"; @@ -36667,7 +37253,7 @@ throw new FactoryConfigurationError(e.getException(), e.getMessage()); --- ./jaxp/src/javax/xml/stream/XMLOutputFactory.java 2013-09-06 11:23:04.000000000 -0700 -+++ ./jaxp/src/javax/xml/stream/XMLOutputFactory.java 2013-12-01 11:13:41.000000000 -0800 ++++ ./jaxp/src/javax/xml/stream/XMLOutputFactory.java 2014-07-15 23:25:05.000000000 -0700 @@ -115,6 +115,7 @@ public static final String IS_REPAIRING_NAMESPACES= "javax.xml.stream.isRepairingNamespaces"; @@ -36717,7 +37303,7 @@ throw new FactoryConfigurationError(e.getException(), e.getMessage()); --- ./jaxp/src/javax/xml/xpath/XPathException.java 2013-09-06 11:23:05.000000000 -0700 -+++ ./jaxp/src/javax/xml/xpath/XPathException.java 2014-06-06 19:56:13.000000000 -0700 ++++ ./jaxp/src/javax/xml/xpath/XPathException.java 2014-07-15 23:25:05.000000000 -0700 @@ -26,6 +26,11 @@ package javax.xml.xpath; @@ -36809,7 +37395,7 @@ /** --- ./jaxws/.hgtags 2013-09-06 11:23:51.000000000 -0700 -+++ ./jaxws/.hgtags 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/.hgtags 2014-07-15 23:25:03.000000000 -0700 @@ -123,6 +123,7 @@ 05469dd4c3662c454f8a019e492543add60795cc jdk7-b146 c01bfd68d0528bc88348813c4d75d7f5c62bc4e2 jdk7u1-b01 @@ -36841,7 +37427,7 @@ 4c5d242efa0d6e0cdb688e41e722bff671dfbfec jdk7u25-b12 6b4a165221304d809f678a18f51c7a8cb042d60b jdk7u25-b13 03073e4e6d3f600102d31e862154f56730838b11 jdk7u25-b14 -@@ -343,3 +360,83 @@ +@@ -343,3 +360,104 @@ 89f6c9663d75d9e4b672aed16f885b84232e9c93 jdk7u40-b42 3ee85b3793de16855e20272336a3565af8477b6b jdk7u40-b43 cbeef786ce489096c39ec5effee4f8f9e770b4af jdk7u40-b60 @@ -36893,6 +37479,7 @@ +a257072fc2aa482abd6ffa28e235dbe532af6d00 jdk7u55-b02 +2916fdfc475bf29bc702887bf5ba02df67c98916 jdk7u55-b03 +f4759b4547602b3bc865db8c5f356f46979c6389 jdk7u55-b04 ++8a8dfdbc66149b89f804c5a50e4692c2520569ae jdk7u65-b00 +8a8dfdbc66149b89f804c5a50e4692c2520569ae jdk7u55-b05 +2696d6747826cea92a97b2d80be4a59ff99462bd jdk7u55-b06 +1ad971afe2b5db93420654fa65b23f827760fed7 jdk7u55-b07 @@ -36906,6 +37493,8 @@ +5d726bf8fedc1f10d250e980653315919b7602f2 jdk7u55-b30 +81d0f297557c4a876727cabeb2bfcdf066a1fc9d jdk7u55-b14 +2d103c97c9bd0b3357e6d5e2b5b9ffb64c271288 jdk7u55-b31 ++b15b4084288fa4ea9caf7f6b4e79d164c77bb1d6 jdk7u55-b32 ++efd71c6ca0832e894b7e1619111860062fa96458 jdk7u55-b33 +cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00 +f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01 +8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02 @@ -36923,10 +37512,28 @@ +43b5a7cf08e7ee018b1fa42a89510b4c381dc4c5 jdk7u60-b14 +d00389bf5439e5c42599604d2ebc909d26df8dcf jdk7u60-b15 +2fc16d3a321212abc0cc93462b22c4be7f693ab9 jdk7u60-b16 -+b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b18 +b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b17 ++b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b18 ++23598a667bb89b57d5abab5b37781a0952e16cf9 jdk7u65-b01 ++1d21eb9011a060c7761c9a8a53e69d58bbea4893 jdk7u60-b19 ++8ac19021e6af5d92b46111a6c41430f36ccdb901 jdk7u65-b02 ++a70d681bc273a110d10cf3c4f9b35b25ca6a600f jdk7u65-b03 ++7cd17f96988509e99fbb71003aeb76d92b638fef jdk7u65-b04 ++7bafb24c6466999bc08742b160d0e450bc12a2c5 jdk7u65-b05 ++35b31c516cab0a81fa9d2a119ec101be3f5a2969 jdk7u65-b06 ++eb89c1c30a93b1d43cbc1b7520bca46d31d0829a jdk7u65-b07 ++d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u65-b08 ++e4cc1e93c6332c8463e75a25c3d735884d185259 jdk7u65-b09 ++d10ec17267415303a71d358ae6202369db77ba96 jdk7u65-b10 ++2f5dcee6d56b00551db21408ebad2ff2faad7c7a jdk7u65-b11 ++f03350485cd388620981bb7e7faa2d1890d11a1b jdk7u65-b12 ++471f883e9830d8341248b99da7c9cfab9fcc94d6 jdk7u65-b13 ++11deffa2096f08dab69de13d4fcf361c6d252636 jdk7u65-b14 ++39ad61a579fd824fbec1bec4e071376449ba8195 jdk7u65-b15 ++198bf1acd262f2c16715d3be5e33d7b8de1e7776 jdk7u65-b16 ++df4dc644fe344e973fc1692c28683eec8ba82600 jdk7u65-b17 --- ./jaxws/src/share/jaf_classes/javax/activation/CommandMap.java 2013-09-06 11:23:51.000000000 -0700 -+++ ./jaxws/src/share/jaf_classes/javax/activation/CommandMap.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaf_classes/javax/activation/CommandMap.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. @@ -37006,7 +37613,7 @@ } --- ./jaxws/src/share/jaf_classes/javax/activation/DataHandler.java 2013-09-06 11:23:51.000000000 -0700 -+++ ./jaxws/src/share/jaf_classes/javax/activation/DataHandler.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaf_classes/javax/activation/DataHandler.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved. @@ -37029,7 +37636,7 @@ /** --- ./jaxws/src/share/jaf_classes/javax/activation/FileTypeMap.java 2013-09-06 11:23:51.000000000 -0700 -+++ ./jaxws/src/share/jaf_classes/javax/activation/FileTypeMap.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaf_classes/javax/activation/FileTypeMap.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. @@ -37115,7 +37722,7 @@ } } --- ./jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java 2013-09-06 11:23:51.000000000 -0700 -+++ ./jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaf_classes/javax/activation/MailcapCommandMap.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. @@ -37154,7 +37761,7 @@ DB = new MailcapFile[dbv.size()]; DB = (MailcapFile[])dbv.toArray(DB); --- ./jaxws/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java 2013-09-06 11:23:51.000000000 -0700 -+++ ./jaxws/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaf_classes/javax/activation/MimetypesFileTypeMap.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2005, Oracle and/or its affiliates. All rights reserved. @@ -37193,7 +37800,7 @@ DB = new MimeTypeFile[dbv.size()]; dbv.copyInto(DB); --- ./jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java 2013-09-06 11:23:52.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/org/glassfish/external/statistics/impl/BoundedRangeStatisticImpl.java 2014-07-15 23:24:59.000000000 -0700 @@ -26,6 +26,7 @@ @@ -37203,7 +37810,7 @@ import java.util.Map; import java.lang.reflect.*; --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java 2013-09-06 11:23:52.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -37234,7 +37841,7 @@ public boolean isBridgeMethod(MethodDeclaration method) { --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java 2013-09-06 11:23:53.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/processor/modeler/annotation/WebServiceVisitor.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -37387,7 +37994,7 @@ } TypeMirror holderType; --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java 2013-09-06 11:23:53.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wscompile/WsimportTool.java 2014-07-15 23:24:59.000000000 -0700 @@ -334,7 +334,7 @@ if(options.verbose) { listener.message(WscompileMessages.WSIMPORT_ARCHIVE_ARTIFACT(f, options.clientjar)); @@ -37398,7 +38005,7 @@ new FileInputStream(f)); JarEntry jarEntry = new JarEntry(entry); --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.java 2014-07-15 23:24:59.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -37487,7 +38094,7 @@ +} + --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/ContextClassloaderLocal.properties 2014-07-15 23:24:59.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -37517,7 +38124,7 @@ +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} + --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java 2013-09-06 11:23:54.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -37544,7 +38151,7 @@ private final DOMForest forest; private final ErrorReceiver errorReceiver; --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java 2013-09-06 11:23:54.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/JAXWSBindingExtensionHandler.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -37570,7 +38177,7 @@ public JAXWSBindingExtensionHandler(Map<String, AbstractExtensionHandler> extensionHandlerMap) { super(extensionHandlerMap); --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java 2013-09-06 11:23:55.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -37595,7 +38202,7 @@ } } --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java 2013-09-06 11:23:55.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -37642,10 +38249,10 @@ } --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java 2014-01-18 12:16:09.000000000 -0800 -@@ -0,0 +1,85 @@ ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java 2014-07-15 23:24:59.000000000 -0700 +@@ -0,0 +1,97 @@ +/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013, 2014, 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 @@ -37677,6 +38284,8 @@ +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; ++import java.security.AccessController; ++import java.security.PrivilegedAction; +import java.util.logging.Level; +import java.util.logging.Logger; + @@ -37687,22 +38296,32 @@ + * + * Has *package private* access to avoid inappropriate usage. + */ -+/* package */ final class Utils { ++final class Utils { + + private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); + + /** + * static ReflectionNavigator field to avoid usage of reflection every time we use it. + */ -+ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; ++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; + + static { // we statically initializing REFLECTION_NAVIGATOR property -+ Class refNav = null; + try { -+ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); ++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); + //noinspection unchecked -+ Method getInstance = refNav.getDeclaredMethod("getInstance"); -+ getInstance.setAccessible(true); ++ final Method getInstance = refNav.getDeclaredMethod("getInstance"); ++ ++ // requires accessClassInPackage privilege ++ AccessController.doPrivileged( ++ new PrivilegedAction<Object>() { ++ @Override ++ public Object run() { ++ getInstance.setAccessible(true); ++ return null; ++ } ++ } ++ ); ++ + //noinspection unchecked + REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); + } catch (ClassNotFoundException e) { @@ -37730,7 +38349,7 @@ + } +} --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.java 2014-07-15 23:24:59.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -37819,7 +38438,7 @@ +} + --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/ContextClassloaderLocal.properties 2014-07-15 23:24:59.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -37849,7 +38468,7 @@ +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} + --- ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java 2013-09-06 11:23:56.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/internalizer/Internalizer.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -37875,7 +38494,7 @@ /** * Internalize all <jaxb:bindings> customizations in the given forest. --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java 2013-09-06 11:23:57.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/DatatypeConverterImpl.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -37945,7 +38564,7 @@ private static final class CalendarFormatter { --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -37996,7 +38615,7 @@ + } +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/Messages.properties 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -38026,7 +38645,7 @@ +FAILED_TO_INITIALE_DATATYPE_FACTORY = \ + Failed to initialize JAXP 1.3 DatatypeFactory class. --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java 2013-09-06 11:23:57.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38052,7 +38671,7 @@ --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java 2013-09-06 11:23:57.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38084,10 +38703,10 @@ } } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java 2014-01-18 12:16:09.000000000 -0800 -@@ -0,0 +1,85 @@ ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java 2014-07-15 23:25:00.000000000 -0700 +@@ -0,0 +1,97 @@ +/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013, 2014, 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 @@ -38119,6 +38738,8 @@ +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; ++import java.security.AccessController; ++import java.security.PrivilegedAction; +import java.util.logging.Level; +import java.util.logging.Logger; + @@ -38129,22 +38750,32 @@ + * + * Has *package private* access to avoid inappropriate usage. + */ -+/* package */ final class Utils { ++final class Utils { + + private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); + + /** + * static ReflectionNavigator field to avoid usage of reflection every time we use it. + */ -+ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; ++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; + + static { // we statically initializing REFLECTION_NAVIGATOR property -+ Class refNav = null; + try { -+ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); ++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); + //noinspection unchecked -+ Method getInstance = refNav.getDeclaredMethod("getInstance"); -+ getInstance.setAccessible(true); ++ final Method getInstance = refNav.getDeclaredMethod("getInstance"); ++ ++ // requires accessClassInPackage privilege ++ AccessController.doPrivileged( ++ new PrivilegedAction<Object>() { ++ @Override ++ public Object run() { ++ getInstance.setAccessible(true); ++ return null; ++ } ++ } ++ ); ++ + //noinspection unchecked + REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); + } catch (ClassNotFoundException e) { @@ -38172,7 +38803,7 @@ + } +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38189,7 +38820,7 @@ ILLEGAL_MIME_TYPE, // 2 args --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Messages.properties 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38208,7 +38839,7 @@ No javax.imageio.ImageWriter is available for the specified MIME type "{0}" --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java 2014-07-15 23:25:00.000000000 -0700 @@ -160,8 +160,8 @@ res = Messages.INCOMPATIBLE_API_VERSION; @@ -38275,7 +38906,7 @@ } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38301,7 +38932,7 @@ public <V> Transducer<V> getTransducer() { --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38361,7 +38992,7 @@ XMLGregorianCalendar cal)throws javax.xml.bind.MarshalException{ StringBuilder buf = new StringBuilder(); --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38387,7 +39018,7 @@ public RuntimeClassInfo getScope() { --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38425,7 +39056,7 @@ protected RuntimeTypeInfoSetImpl createTypeInfoSet() { return new RuntimeTypeInfoSetImpl(reader); --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38464,10 +39095,10 @@ return (RuntimeNonElement)super.getTypeInfo(type); } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java 2014-01-18 12:16:09.000000000 -0800 -@@ -0,0 +1,85 @@ ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java 2014-07-15 23:25:00.000000000 -0700 +@@ -0,0 +1,97 @@ +/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013, 2014, 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 @@ -38499,6 +39130,8 @@ +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; ++import java.security.AccessController; ++import java.security.PrivilegedAction; +import java.util.logging.Level; +import java.util.logging.Logger; + @@ -38509,22 +39142,32 @@ + * + * Has *package private* access to avoid inappropriate usage. + */ -+/* package */ final class Utils { ++final class Utils { + + private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); + + /** + * static ReflectionNavigator field to avoid usage of reflection every time we use it. + */ -+ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; ++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; + + static { // we statically initializing REFLECTION_NAVIGATOR property -+ Class refNav = null; + try { -+ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); ++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); + //noinspection unchecked -+ Method getInstance = refNav.getDeclaredMethod("getInstance"); -+ getInstance.setAccessible(true); ++ final Method getInstance = refNav.getDeclaredMethod("getInstance"); ++ ++ // requires accessClassInPackage privilege ++ AccessController.doPrivileged( ++ new PrivilegedAction<Object>() { ++ @Override ++ public Object run() { ++ getInstance.setAccessible(true); ++ return null; ++ } ++ } ++ ); ++ + //noinspection unchecked + REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); + } catch (ClassNotFoundException e) { @@ -38552,7 +39195,7 @@ + } +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38589,7 +39232,7 @@ /** * Returns true if this method is a bridge method as defined in JLS. --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -38673,7 +39316,7 @@ String name = method.getName(); Class[] params = method.getParameterTypes(); --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38697,7 +39340,7 @@ - ReflectionNavigator getNavigator(); } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38727,11 +39370,11 @@ constructor = null; else { --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, 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 @@ -38743,7 +39386,22 @@ import com.sun.xml.internal.bind.v2.model.runtime.RuntimeArrayInfo; import com.sun.xml.internal.bind.v2.model.runtime.RuntimeBuiltinLeafInfo; import com.sun.xml.internal.bind.v2.model.runtime.RuntimeClassInfo; -@@ -358,7 +357,7 @@ +@@ -131,14 +130,6 @@ + private final Map<TypeReference,Bridge> bridges = new LinkedHashMap<TypeReference,Bridge>(); + + /** +- * Shared instance of {@link TransformerFactory}. +- * Lock before use, because a {@link TransformerFactory} is not thread-safe +- * whereas {@link JAXBContextImpl} is. +- * Lazily created. +- */ +- private volatile static SAXTransformerFactory tf; +- +- /** + * Shared instance of {@link DocumentBuilder}. + * Lock before use. Lazily created. + */ +@@ -358,7 +349,7 @@ beanInfoMap.put( e.getKey(), beanInfoMap.get(e.getValue()) ); // build bridges @@ -38752,7 +39410,7 @@ for (TypeReference tr : typeRefs) { XmlJavaTypeAdapter xjta = tr.get(XmlJavaTypeAdapter.class); -@@ -366,7 +365,7 @@ +@@ -366,7 +357,7 @@ XmlList xl = tr.get(XmlList.class); // eventually compute the in-memory type @@ -38761,7 +39419,7 @@ if(xjta!=null) { a = new Adapter<Type,Class>(xjta.value(),nav); -@@ -377,7 +376,7 @@ +@@ -377,7 +368,7 @@ } if(a!=null) { @@ -38770,7 +39428,37 @@ } Name name = nameBuilder.createElementName(tr.tagName); -@@ -873,7 +872,7 @@ +@@ -703,13 +694,7 @@ + */ + static Transformer createTransformer() { + try { +- if (tf==null) { +- synchronized(JAXBContextImpl.class) { +- if (tf==null) { +- tf = (SAXTransformerFactory)TransformerFactory.newInstance(); +- } +- } +- } ++ SAXTransformerFactory tf = (SAXTransformerFactory)TransformerFactory.newInstance(); + return tf.newTransformer(); + } catch (TransformerConfigurationException e) { + throw new Error(e); // impossible +@@ -721,13 +706,7 @@ + */ + public static TransformerHandler createTransformerHandler() { + try { +- if (tf==null) { +- synchronized(JAXBContextImpl.class) { +- if (tf==null) { +- tf = (SAXTransformerFactory)TransformerFactory.newInstance(); +- } +- } +- } ++ SAXTransformerFactory tf = (SAXTransformerFactory)TransformerFactory.newInstance(); + return tf.newTransformerHandler(); + } catch (TransformerConfigurationException e) { + throw new Error(e); // impossible +@@ -873,7 +852,7 @@ // this is a special class we introduced for JAX-WS that we *don't* want in the schema } else { NonElement<Type,Class> typeInfo = getXmlType(tis,tr); @@ -38780,10 +39468,10 @@ } return xsdgen; --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java 2014-01-18 12:16:09.000000000 -0800 -@@ -0,0 +1,85 @@ ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java 2014-07-15 23:25:00.000000000 -0700 +@@ -0,0 +1,97 @@ +/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013, 2014, 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 @@ -38815,6 +39503,8 @@ +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; ++import java.security.AccessController; ++import java.security.PrivilegedAction; +import java.util.logging.Level; +import java.util.logging.Logger; + @@ -38825,22 +39515,32 @@ + * + * Has *package private* access to avoid inappropriate usage. + */ -+/* package */ final class Utils { ++final class Utils { + + private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); + + /** + * static ReflectionNavigator field to avoid usage of reflection every time we use it. + */ -+ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; ++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; + + static { // we statically initializing REFLECTION_NAVIGATOR property -+ Class refNav = null; + try { -+ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); ++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); + //noinspection unchecked -+ Method getInstance = refNav.getDeclaredMethod("getInstance"); -+ getInstance.setAccessible(true); ++ final Method getInstance = refNav.getDeclaredMethod("getInstance"); ++ ++ // requires accessClassInPackage privilege ++ AccessController.doPrivileged( ++ new PrivilegedAction<Object>() { ++ @Override ++ public Object run() { ++ getInstance.setAccessible(true); ++ return null; ++ } ++ } ++ ); ++ + //noinspection unchecked + REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); + } catch (ClassNotFoundException e) { @@ -38868,7 +39568,7 @@ + } +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38935,7 +39635,7 @@ } catch (Throwable e) { return null; --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38961,7 +39661,7 @@ acc = prop.getAccessor().optimize(context); assert acc!=null; --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -38988,10 +39688,10 @@ // TODO: error check for mapImplClass==null // what is the error reporting path for this part of the code? --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java 2014-01-18 12:16:09.000000000 -0800 -@@ -0,0 +1,85 @@ ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java 2014-07-15 23:25:00.000000000 -0700 +@@ -0,0 +1,97 @@ +/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013, 2014, 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 @@ -39023,6 +39723,8 @@ +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; ++import java.security.AccessController; ++import java.security.PrivilegedAction; +import java.util.logging.Level; +import java.util.logging.Logger; + @@ -39033,22 +39735,32 @@ + * + * Has *package private* access to avoid inappropriate usage. + */ -+/* package */ final class Utils { ++final class Utils { + + private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); + + /** + * static ReflectionNavigator field to avoid usage of reflection every time we use it. + */ -+ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; ++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; + + static { // we statically initializing REFLECTION_NAVIGATOR property -+ Class refNav = null; + try { -+ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); ++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); + //noinspection unchecked -+ Method getInstance = refNav.getDeclaredMethod("getInstance"); -+ getInstance.setAccessible(true); ++ final Method getInstance = refNav.getDeclaredMethod("getInstance"); ++ ++ // requires accessClassInPackage privilege ++ AccessController.doPrivileged( ++ new PrivilegedAction<Object>() { ++ @Override ++ public Object run() { ++ getInstance.setAccessible(true); ++ return null; ++ } ++ } ++ ); ++ + //noinspection unchecked + REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); + } catch (ClassNotFoundException e) { @@ -39076,7 +39788,7 @@ + } +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java 2013-09-06 11:23:58.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -39102,7 +39814,7 @@ adapter.adapterType); } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java 2013-09-06 11:23:59.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -39140,7 +39852,7 @@ itemType = Object.class; l = new CollectionLister(getImplClass(rawType)); --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java 2013-09-06 11:23:59.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -39167,10 +39879,10 @@ if(prop.id()==ID.IDREF) --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java 2014-01-18 12:16:09.000000000 -0800 -@@ -0,0 +1,85 @@ ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java 2014-07-15 23:25:00.000000000 -0700 +@@ -0,0 +1,97 @@ +/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013, 2014, 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 @@ -39202,6 +39914,8 @@ +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; ++import java.security.AccessController; ++import java.security.PrivilegedAction; +import java.util.logging.Level; +import java.util.logging.Logger; + @@ -39212,22 +39926,32 @@ + * + * Has *package private* access to avoid inappropriate usage. + */ -+/* package */ final class Utils { ++final class Utils { + + private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); + + /** + * static ReflectionNavigator field to avoid usage of reflection every time we use it. + */ -+ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; ++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; + + static { // we statically initializing REFLECTION_NAVIGATOR property -+ Class refNav = null; + try { -+ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); ++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); + //noinspection unchecked -+ Method getInstance = refNav.getDeclaredMethod("getInstance"); -+ getInstance.setAccessible(true); ++ final Method getInstance = refNav.getDeclaredMethod("getInstance"); ++ ++ // requires accessClassInPackage privilege ++ AccessController.doPrivileged( ++ new PrivilegedAction<Object>() { ++ @Override ++ public Object run() { ++ getInstance.setAccessible(true); ++ return null; ++ } ++ } ++ ); ++ + //noinspection unchecked + REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); + } catch (ClassNotFoundException e) { @@ -39255,7 +39979,7 @@ + } +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java 2013-09-06 11:23:59.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -39319,7 +40043,7 @@ - } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java 2013-09-06 11:24:01.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/AttachmentPartImpl.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -39467,7 +40191,7 @@ +} \ No newline at end of file --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.java 2014-07-15 23:24:59.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -39556,7 +40280,7 @@ +} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/ContextClassloaderLocal.properties 2014-07-15 23:24:59.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -39586,7 +40310,7 @@ +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java 2013-09-06 11:24:01.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging/saaj/soap/EnvelopeFactory.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -39706,7 +40430,7 @@ } } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java 2013-09-06 11:24:01.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/MemoryData.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -39715,7 +40439,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java 2013-09-06 11:24:01.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/org/jvnet/mimepull/TempFiles.java 2014-07-15 23:24:59.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -39724,7 +40448,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -39813,7 +40537,7 @@ +} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/ContextClassloaderLocal.properties 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -39843,7 +40567,7 @@ +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java 2013-09-06 11:24:03.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream/buffer/XMLStreamBuffer.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. @@ -39875,7 +40599,7 @@ return n.getLastChild(); } catch (TransformerException e) { --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java 2013-09-06 11:24:04.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java 2013-12-01 11:13:43.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/InstanceResolver.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -39893,7 +40617,7 @@ postInvoke(p,t); } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java 2013-12-01 11:13:43.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/server/MethodUtil.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -39990,7 +40714,7 @@ + +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -40079,7 +40803,7 @@ +} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/ContextClassloaderLocal.properties 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -40109,7 +40833,7 @@ +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java 2013-09-06 11:24:04.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamReaderFactory.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -40183,7 +40907,7 @@ public static XMLStreamReader create(InputSource source, boolean rejectDTDs) { --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java 2013-09-06 11:24:04.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/api/streaming/XMLStreamWriterFactory.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -40280,7 +41004,7 @@ /** --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java 2013-09-06 11:24:04.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/binding/BindingImpl.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -40366,7 +41090,7 @@ + } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java 2013-09-06 11:24:05.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/WSServiceDelegate.java 2014-07-15 23:25:00.000000000 -0700 @@ -22,6 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. @@ -40471,7 +41195,7 @@ Thread daemonThread = new Thread(r); daemonThread.setDaemon(Boolean.TRUE); --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java 2013-12-01 11:13:43.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -40568,7 +41292,7 @@ + +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java 2013-09-06 11:24:05.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java 2013-12-01 11:13:43.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/client/sei/SEIStub.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -40644,7 +41368,7 @@ return super.process(request, rc, receiver); } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -40733,7 +41457,7 @@ +} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/ContextClassloaderLocal.properties 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -40763,7 +41487,7 @@ +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java 2013-09-06 11:24:05.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/developer/MemberSubmissionEndpointReference.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -40804,7 +41528,7 @@ marshaller.marshal(this, result); } catch (JAXBException e) { --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java 2013-09-06 11:24:05.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/encoding/MimeCodec.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -40857,7 +41581,7 @@ private String boundary; --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java 2013-09-06 11:24:05.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -40924,7 +41648,7 @@ + } } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -40985,10 +41709,10 @@ i++; } --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java 2014-01-18 12:16:09.000000000 -0800 -@@ -0,0 +1,85 @@ ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java 2014-07-15 23:25:00.000000000 -0700 +@@ -0,0 +1,97 @@ +/* -+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2013, 2014, 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 @@ -41020,6 +41744,8 @@ +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.Type; ++import java.security.AccessController; ++import java.security.PrivilegedAction; +import java.util.logging.Level; +import java.util.logging.Logger; + @@ -41030,22 +41756,32 @@ + * + * Has *package private* access to avoid inappropriate usage. + */ -+/* package */ final class Utils { ++final class Utils { + + private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); + + /** + * static ReflectionNavigator field to avoid usage of reflection every time we use it. + */ -+ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; ++ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; + + static { // we statically initializing REFLECTION_NAVIGATOR property -+ Class refNav = null; + try { -+ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); ++ Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); + //noinspection unchecked -+ Method getInstance = refNav.getDeclaredMethod("getInstance"); -+ getInstance.setAccessible(true); ++ final Method getInstance = refNav.getDeclaredMethod("getInstance"); ++ ++ // requires accessClassInPackage privilege ++ AccessController.doPrivileged( ++ new PrivilegedAction<Object>() { ++ @Override ++ public Object run() { ++ getInstance.setAccessible(true); ++ return null; ++ } ++ } ++ ); ++ + //noinspection unchecked + REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); + } catch (ClassNotFoundException e) { @@ -41073,7 +41809,7 @@ + } +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java 2014-01-18 12:16:09.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41091,7 +41827,7 @@ private static final class RuntimeWrapperBeanGenerator extends AbstractWrapperBeanGenerator<java.lang.reflect.Type, Class, java.lang.reflect.Method, Field> { --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionSet.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionSet.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionSet.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41100,7 +41836,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/AssertionValidationProcessor.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41109,7 +41845,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/ComplexAssertion.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41118,7 +41854,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectiveAlternativeSelector.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41127,7 +41863,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/EffectivePolicyModifier.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41136,7 +41872,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/NestedPolicy.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41145,7 +41881,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/Policy.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41154,7 +41890,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyAssertion.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41163,7 +41899,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyConstants.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41172,7 +41908,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyException.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41181,7 +41917,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyIntersector.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41190,7 +41926,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMap.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41199,7 +41935,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapExtender.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41208,7 +41944,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKey.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41217,7 +41953,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapKeyHandler.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41226,7 +41962,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMapMutator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41235,7 +41971,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyMerger.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41244,7 +41980,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicyScope.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41253,7 +41989,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/PolicySubject.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41262,7 +41998,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/SimpleAssertion.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41271,7 +42007,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java 2013-09-06 11:24:06.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/package-info.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41280,7 +42016,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java 2013-12-01 11:13:43.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/MethodUtil.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -41375,7 +42111,7 @@ + +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyLogger.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41384,7 +42120,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java 2013-12-01 11:13:43.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/PolicyUtils.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41418,7 +42154,7 @@ return resultClass.cast(result); } catch (IllegalArgumentException e) { --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/RuntimePolicyUtilsException.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41427,7 +42163,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceConfigurationError.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41436,7 +42172,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/ServiceFinder.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41445,7 +42181,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/privateutil/package-info.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41454,7 +42190,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/AssertionData.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41463,7 +42199,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/CompactModelGenerator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41472,7 +42208,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/DefaultPolicyAssertionCreator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41481,7 +42217,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/ModelNode.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41490,7 +42226,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/NormalizedModelGenerator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41499,7 +42235,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelGenerator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41508,7 +42244,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelMarshaller.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41517,7 +42253,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelTranslator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41526,7 +42262,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyModelUnmarshaller.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41535,7 +42271,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicyReferenceData.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41544,7 +42280,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModel.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41553,7 +42289,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/PolicySourceModelContext.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41562,7 +42298,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelMarshaller.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41571,7 +42307,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/XmlPolicyModelUnmarshaller.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41580,7 +42316,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -41669,7 +42405,7 @@ +} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ContextClassloaderLocal.properties 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -41699,7 +42435,7 @@ +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41732,7 +42468,7 @@ final Map<URI, Policy> map = instance.unmarshal(reader, null); LOGGER.exiting(map); --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/package-info.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41741,7 +42477,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/package-info.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41750,7 +42486,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/NamespaceVersion.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41759,7 +42495,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/wspolicy/XmlToken.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41768,7 +42504,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AbstractQNameValidator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41777,7 +42513,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/AssertionCreationException.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41786,7 +42522,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionCreator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41795,7 +42531,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PolicyAssertionValidator.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41804,7 +42540,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/PrefixMapper.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41813,7 +42549,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/spi/package-info.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41822,7 +42558,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/PolicyMapKeyConverter.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41831,7 +42567,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/WsdlBindingSubject.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41840,7 +42576,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/policy/subject/package-info.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41849,7 +42585,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java 2013-12-01 11:13:43.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/AbstractInstanceResolver.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -41867,7 +42603,7 @@ throw new ServerRtException("server.rt.err",e); } catch (InvocationTargetException e) { --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java 2013-12-01 11:13:43.000000000 -0800 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/server/MethodUtil.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,94 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -41964,7 +42700,7 @@ + +} --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -42053,7 +42789,7 @@ +} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ContextClassloaderLocal.properties 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -42083,7 +42819,7 @@ +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java 2013-09-06 11:24:07.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -42115,7 +42851,7 @@ } catch (JAXBException e) { throw new WebServiceException("Error creating Marshaller or marshalling.", e); --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -42204,7 +42940,7 @@ +} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/ContextClassloaderLocal.properties 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -42234,7 +42970,7 @@ +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java 2013-09-06 11:24:08.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/util/xml/XmlUtil.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -42291,7 +43027,7 @@ reader.setProperty(LEXICAL_HANDLER_PROPERTY, th); reader.parse(toInputSource(ssrc)); --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.java 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -42380,7 +43116,7 @@ +} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/ContextClassloaderLocal.properties 2014-07-15 23:25:00.000000000 -0700 @@ -0,0 +1,27 @@ +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -42410,7 +43146,7 @@ +FAILED_TO_CREATE_NEW_INSTANCE=Failed to create new instance of {0} + --- ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java 2013-09-06 11:24:10.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom/util/DomAnnotationParserFactory.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -42442,7 +43178,7 @@ throw new Error(e); // impossible } --- ./jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java 2013-09-06 11:24:10.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/bind/DatatypeConverterImpl.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42530,7 +43266,7 @@ private static final class CalendarFormatter { --- ./jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java 2013-09-06 11:24:10.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -42546,7 +43282,7 @@ + static final String FAILED_TO_INITIALE_DATATYPE_FACTORY = "FAILED_TO_INITIALE_DATATYPE_FACTORY"; } --- ./jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.properties 2013-09-06 11:24:10.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.properties 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/bind/Messages.properties 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42562,7 +43298,7 @@ +FAILED_TO_INITIALE_DATATYPE_FACTORY = \ + Failed to initialize JAXP 1.3 DatatypeFactory class. --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/AttachmentPart.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42571,7 +43307,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Detail.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42580,7 +43316,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/DetailEntry.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42589,7 +43325,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/FactoryFinder.java 2014-07-15 23:25:00.000000000 -0700 @@ -40,11 +40,12 @@ */ private static Object newInstance(String className, @@ -42693,7 +43429,7 @@ return Class.forName(className); --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MessageFactory.java 2014-07-15 23:25:00.000000000 -0700 @@ -96,8 +96,9 @@ * @see SAAJMetaFactory */ @@ -42717,7 +43453,7 @@ throw new SOAPException( "Unable to create message factory for SOAP: " --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeader.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42726,7 +43462,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/MimeHeaders.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42735,7 +43471,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Name.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42744,7 +43480,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Node.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42753,7 +43489,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SAAJResult.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42762,7 +43498,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBody.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42771,7 +43507,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPBodyElement.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42780,7 +43516,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConnection.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42789,7 +43525,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPConstants.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42798,7 +43534,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElement.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42807,7 +43543,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPElementFactory.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42816,7 +43552,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPEnvelope.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42825,7 +43561,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPException.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42834,7 +43570,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFactory.java 2014-07-15 23:25:00.000000000 -0700 @@ -261,7 +261,8 @@ throws SOAPException { @@ -42846,7 +43582,7 @@ return factory; return newInstance(SOAPConstants.SOAP_1_1_PROTOCOL); --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFault.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42855,7 +43591,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPFaultElement.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42864,7 +43600,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeader.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42873,7 +43609,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPHeaderElement.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42882,7 +43618,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPMessage.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42891,7 +43627,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/SOAPPart.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42900,7 +43636,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java 2014-06-06 19:56:15.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/soap/Text.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -42909,7 +43645,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2013-09-06 11:24:11.000000000 -0700 -+++ ./jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2014-04-19 01:27:03.000000000 -0700 ++++ ./jaxws/src/share/jaxws_classes/javax/xml/ws/wsaddressing/W3CEndpointReference.java 2014-07-15 23:25:00.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. @@ -42927,7 +43663,7 @@ protected W3CEndpointReference() { } --- ./jdk/.hgtags 2013-09-06 11:27:36.000000000 -0700 -+++ ./jdk/.hgtags 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/.hgtags 2014-07-15 23:24:50.000000000 -0700 @@ -123,6 +123,7 @@ 539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146 69e973991866c948cf1808b06884ef2d28b64fcb jdk7u1-b01 @@ -42936,7 +43672,7 @@ 2baf612764d215e6f3a5b48533f74c6924ac98d7 jdk7u1-b02 a4781b6d9cfb6901452579adee17c9a17c1b584c jdk7u1-b03 b223ed9a5fdf8ce3af42adfa8815975811d70eae jdk7u1-b04 -@@ -342,3 +343,84 @@ +@@ -342,3 +343,105 @@ b479996d5c924128c3490165b592bf66a3034932 jdk7u40-b42 fb25cdef17e9610db5cb89fc35c0c4abef5ad781 jdk7u40-b43 ed444a09a5fd32237deaef6e43804e20ba4f6352 jdk7u40-b60 @@ -42989,6 +43725,7 @@ +2ca3e1fa4455ad564228ad6e654498167af2f20d jdk7u55-b02 +c12b3c81366cb067ff4444952209d54bfa387353 jdk7u55-b03 +476d1bddaa32bf440953c3b1814ba38f16886c03 jdk7u55-b04 ++7fa6d3ba2cc77cd1e6f24e33f0c39788cb2893b8 jdk7u65-b00 +7fa6d3ba2cc77cd1e6f24e33f0c39788cb2893b8 jdk7u55-b05 +795654fce29c38d4c8504f760d8d8a36248d38ed jdk7u55-b06 +4b2ed892b195e95f7541aaa3b129a2caa5faae1d jdk7u55-b07 @@ -43002,6 +43739,8 @@ +4a5651c84b1e6cf26dc9b19f00747e5004efba68 jdk7u55-b30 +ffd99c5975217a14609851602c5f5dc005234aba jdk7u55-b14 +88f1bf248cc520e0bf7ef17bc862f87aab958373 jdk7u55-b31 ++b83f5194edf23b752fe2c0a9be361455f87196df jdk7u55-b32 ++01a4cd03a6c85abb62eb5d1c2b5bf7d2f544c04e jdk7u55-b33 +db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00 +def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01 +ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02 @@ -43019,10 +43758,28 @@ +b7fbd9b4febf8961091fdf451d3da477602a8f1d jdk7u60-b14 +04882f9a073e8de153ec7ad32486569fd9a087ec jdk7u60-b15 +41547583c3a035c3924ffedfa8704e58d69e5c50 jdk7u60-b16 -+e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b18 +e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b17 ++e484202d9a4104840d758a21b2bba1250e766343 jdk7u60-b18 ++c220d329a78161f79df73048ed55db91f538e3b7 jdk7u65-b01 ++7190843ddaf4f3ad158c3071be0f4ca42a5802dc jdk7u60-b19 ++a42a3bb22f6991d8f6a30e4f1782ad620c40eb65 jdk7u65-b02 ++756071871d61e1ca410c63a3f1c4dabcc51a90df jdk7u65-b03 ++bac16c82c14a35d1e9d3c4d0bd317dbbb296f34e jdk7u65-b04 ++14b3f82c245fb8d0eeb21dc99ff0b4985571910c jdk7u65-b05 ++7d8e5d90789533b5cc22eeb15c19ce1bb8a20573 jdk7u65-b06 ++cde691a6989fa875107a3974aa92681d286be6ec jdk7u65-b07 ++d5353f8e1e02e12a1262d65ed85183425b0cdf13 jdk7u65-b08 ++45913a29c1edd3e63c9c818ffab7aebd4d75fa40 jdk7u65-b09 ++3bb943c6ff7dd614cb428501db8c2c655e5f5223 jdk7u65-b10 ++b84e98280630be44a87f4336009f61350f3c7dc0 jdk7u65-b11 ++61d15f512305655a51c04811006850e4955936bd jdk7u65-b12 ++69698344d0a1771ed9162ecad2065829ca1f8994 jdk7u65-b13 ++2e6105ddad44866c4cdc1ba06620b48685e34111 jdk7u65-b14 ++8cff6ce00a91820b4cb7ef24ed42063c2305127d jdk7u65-b15 ++190017413768f02addea8b2c5106157e3c4076c7 jdk7u65-b16 ++23e78e36bc39f4f761ac2b0e055c562c3ff204f5 jdk7u65-b17 --- ./jdk/make/bridge/AccessBridgeJava/Makefile 2013-09-06 11:27:36.000000000 -0700 -+++ ./jdk/make/bridge/AccessBridgeJava/Makefile 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/make/bridge/AccessBridgeJava/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -43049,7 +43806,7 @@ all : build $(JARFILE) --- ./jdk/make/bridge/Jabswitch/Makefile 2013-09-06 11:27:36.000000000 -0700 -+++ ./jdk/make/bridge/Jabswitch/Makefile 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/make/bridge/Jabswitch/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -53,7 +53,7 @@ buildexe : $(CD) $(TEMPDIR) @@ -43060,7 +43817,7 @@ copyfilejab : --- ./jdk/make/com/oracle/Makefile 2013-09-06 11:27:36.000000000 -0700 -+++ ./jdk/make/com/oracle/Makefile 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/make/com/oracle/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -30,22 +30,8 @@ #SUBDIRS_MAKEFLAGS += JAVAC_LINT_OPTIONS=-Xlint:all,-deprecation,-path include $(BUILDDIR)/common/Defs.gmk @@ -43087,7 +43844,7 @@ # build com/oracle/security/ucrypto on Solaris platform for non-OpenJDK builds --- ./jdk/make/com/sun/jmx/Makefile 2013-09-06 11:27:36.000000000 -0700 -+++ ./jdk/make/com/sun/jmx/Makefile 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/make/com/sun/jmx/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. @@ -43119,7 +43876,7 @@ @$(java-vm-cleanup) --- ./jdk/make/com/sun/nio/Makefile 2013-09-06 11:27:36.000000000 -0700 -+++ ./jdk/make/com/sun/nio/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/com/sun/nio/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -31,11 +31,18 @@ include $(BUILDDIR)/common/Defs.gmk @@ -43141,7 +43898,7 @@ all build clean clobber:: $(SUBDIRS-loop) --- ./jdk/make/com/sun/nio/sctp/Makefile 2013-09-06 11:27:36.000000000 -0700 -+++ ./jdk/make/com/sun/nio/sctp/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/com/sun/nio/sctp/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -59,15 +59,11 @@ -I$(PLATFORM_SRC)/native/java/net \ -I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders @@ -43161,7 +43918,7 @@ else # windows include $(BUILDDIR)/common/Classes.gmk --- ./jdk/make/com/sun/security/auth/module/Makefile 2013-09-06 11:27:36.000000000 -0700 -+++ ./jdk/make/com/sun/security/auth/module/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/com/sun/security/auth/module/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -67,7 +67,7 @@ include FILES_c_solaris.gmk endif # solaris @@ -43172,7 +43929,7 @@ include FILES_export_unix.gmk include FILES_c_unix.gmk --- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -43,7 +43,7 @@ sun/tools/attach/LinuxVirtualMachine.java endif @@ -43183,7 +43940,7 @@ sun/tools/attach/BsdVirtualMachine.java endif --- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -39,7 +39,7 @@ LinuxVirtualMachine.c endif @@ -43194,7 +43951,7 @@ BsdVirtualMachine.c endif --- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -43,7 +43,7 @@ sun/tools/attach/LinuxAttachProvider.java endif @@ -43205,7 +43962,7 @@ sun/tools/attach/BsdAttachProvider.java endif --- ./jdk/make/com/sun/tools/attach/Makefile 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -38,7 +38,7 @@ ifeq ($(PLATFORM), linux) FILES_m = mapfile-linux @@ -43225,7 +43982,7 @@ else vpath %.c $(PLATFORM_SRC)/native/sun/tools/attach --- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2014-07-15 23:24:33.000000000 -0700 @@ -30,6 +30,7 @@ Java_sun_tools_attach_BsdVirtualMachine_checkPermissions; Java_sun_tools_attach_BsdVirtualMachine_close; @@ -43235,7 +43992,7 @@ Java_sun_tools_attach_BsdVirtualMachine_sendQuitTo; Java_sun_tools_attach_BsdVirtualMachine_socket; --- ./jdk/make/common/Defs-bsd.gmk 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/make/common/Defs-bsd.gmk 2014-06-06 19:56:39.000000000 -0700 ++++ ./jdk/make/common/Defs-bsd.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -0,0 +1,482 @@ +# +# Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. @@ -43720,7 +44477,7 @@ + OTHER_CPPFLAGS += -I$(OPENWIN_HOME)/include +endif --- ./jdk/make/common/Defs-embedded.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Defs-embedded.gmk 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/make/common/Defs-embedded.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -71,7 +71,9 @@ # and it must be linked after fdlibm - this places it at the end after libc # -z muldefs avoids linker errors for duplicate symbols. @@ -43733,7 +44490,7 @@ endif --- ./jdk/make/common/Defs-linux.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Defs-linux.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/Defs-linux.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -426,6 +426,7 @@ override LIBDL = -ldl override MOOT_PRIORITIES = true @@ -43743,7 +44500,7 @@ override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 else --- ./jdk/make/common/Defs-macosx.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Defs-macosx.gmk 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/make/common/Defs-macosx.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -397,11 +397,14 @@ INCLUDE_SA = true endif @@ -43766,7 +44523,7 @@ LIB_LOCATION ?= $(LIBDIR) --- ./jdk/make/common/Defs-solaris.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Defs-solaris.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/Defs-solaris.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -753,6 +753,9 @@ # Network Services library LIBNSL = -lnsl @@ -43778,7 +44535,7 @@ LIBSCF = -lscf --- ./jdk/make/common/Defs.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Defs.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/Defs.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -179,15 +179,15 @@ ifdef ALT_FREETYPE_LIB_PATH @@ -43830,7 +44587,7 @@ else VPATH0.java = $(GENSRCDIR)$(CLASSPATH_SEPARATOR)$(PLATFORM_SRC)/classes$(CLASSPATH_SEPARATOR)$(SHARE_SRC)/classes --- ./jdk/make/common/Library.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Library.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/Library.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -299,8 +299,12 @@ ifeq ($(PLATFORM), solaris) $(STRIP) -x $@ @@ -43847,7 +44604,7 @@ # implied else here is no stripping at all endif --- ./jdk/make/common/Mapfile-vers.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Mapfile-vers.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/Mapfile-vers.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -76,7 +76,7 @@ endif # PLATFORM @@ -43858,7 +44615,7 @@ ifeq ($(VARIANT), OPT) # OPT build MUST have a mapfile? --- ./jdk/make/common/Program.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Program.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/Program.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -95,23 +95,31 @@ endif # SYSTEM_ZLIB endif # PLATFORM @@ -43949,7 +44706,7 @@ OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"' VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"' --- ./jdk/make/common/Release-macosx.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Release-macosx.gmk 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/make/common/Release-macosx.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -58,6 +58,9 @@ jdk-bundle-setup: $(RM) -r $(JDK_BUNDLE_DIR) @@ -43969,7 +44726,7 @@ .PHONY: $(EXTRA_JRE_TARGETS) $(EXTRA_IMAGE_TARGETS) --- ./jdk/make/common/Release.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Release.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/Release.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -180,6 +180,12 @@ JA_DIRNAME=ja_JP.UTF-8 endif # linux @@ -44090,7 +44847,7 @@ fi; \ done --- ./jdk/make/common/Rules.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/Rules.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/Rules.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -51,7 +51,7 @@ # # All source tree areas for java/properties files (a few may be closed) @@ -44110,7 +44867,7 @@ $(CLASSDESTDIR)/%.class: $(JDK_TOPDIR)/src/macosx/classes/%.java @$(add-java-file) --- ./jdk/make/common/shared/Compiler-gcc.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/shared/Compiler-gcc.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -72,6 +72,21 @@ endif @@ -44134,7 +44891,7 @@ # Settings specific to Solaris --- ./jdk/make/common/shared/Defs-bsd.gmk 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/make/common/shared/Defs-bsd.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/shared/Defs-bsd.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -0,0 +1,267 @@ +# +# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. @@ -44404,7 +45161,7 @@ +endif + --- ./jdk/make/common/shared/Defs-utils.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/shared/Defs-utils.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/shared/Defs-utils.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -74,6 +74,13 @@ UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH) endif @@ -44456,7 +45213,7 @@ + endif +endif --- ./jdk/make/common/shared/Defs-versions.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/shared/Defs-versions.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/shared/Defs-versions.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -44,6 +44,11 @@ override CC_VERSION = gcc endif @@ -44484,7 +45241,7 @@ ifeq ($(PLATFORM), macosx) REQUIRED_OS_NAME = Darwin --- ./jdk/make/common/shared/Defs.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/shared/Defs.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/shared/Defs.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -181,7 +181,7 @@ # platform and shared sources/headers. This is mainly useful for the # Mac OS X build, which pulls its platform sources from the solaris and/or @@ -44521,7 +45278,7 @@ endif --- ./jdk/make/common/shared/Platform.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/common/shared/Platform.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/common/shared/Platform.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -298,6 +298,85 @@ # How much RAM does this machine have: endif @@ -44609,7 +45366,7 @@ ifeq ($(SYSTEM_UNAME), Windows_NT) PLATFORM = windows --- ./jdk/make/java/Makefile 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/Makefile 2014-07-15 23:24:32.000000000 -0700 @@ -53,14 +53,10 @@ endif endif # PLATFORM @@ -44627,7 +45384,7 @@ all build clean clobber:: --- ./jdk/make/java/instrument/Makefile 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/instrument/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/instrument/Makefile 2014-07-15 23:24:32.000000000 -0700 @@ -104,12 +104,24 @@ # equivalent of strcasecmp is stricmp on Windows CPPFLAGS_COMMON += -Dstrcasecmp=stricmp @@ -44659,7 +45416,7 @@ OTHER_LDLIBS += -lz endif --- ./jdk/make/java/java/Exportedfiles.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/java/Exportedfiles.gmk 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/make/java/java/Exportedfiles.gmk 2014-07-15 23:24:32.000000000 -0700 @@ -50,6 +50,7 @@ java/lang/SecurityManager.java \ java/lang/Shutdown.java \ @@ -44669,7 +45426,7 @@ java/lang/reflect/AccessibleObject.java \ java/lang/reflect/Field.java \ --- ./jdk/make/java/java/FILES_c.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/java/FILES_c.gmk 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/make/java/java/FILES_c.gmk 2014-07-15 23:24:32.000000000 -0700 @@ -37,7 +37,6 @@ FileInputStream.c \ FileInputStream_md.c \ @@ -44679,7 +45436,7 @@ Object.c \ ObjectOutputStream.c \ --- ./jdk/make/java/java/Makefile 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/java/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/java/Makefile 2014-07-15 23:24:32.000000000 -0700 @@ -84,6 +84,7 @@ java/util/prefs/FileSystemPreferencesFactory.java \ @@ -44757,7 +45514,7 @@ + +endif #BUILDHELPER --- ./jdk/make/java/java/genlocales.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/java/genlocales.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/java/genlocales.gmk 2014-07-15 23:24:32.000000000 -0700 @@ -93,18 +93,66 @@ else @@ -44830,7 +45587,7 @@ genlocales : $(LocaleDataMetaInfo_Dest) --- ./jdk/make/java/java/mapfile-vers 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/java/mapfile-vers 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/make/java/java/mapfile-vers 2014-07-15 23:24:32.000000000 -0700 @@ -121,6 +121,7 @@ Java_java_io_UnixFileSystem_setReadOnly; Java_java_io_UnixFileSystem_setPermission; @@ -44857,7 +45614,7 @@ Java_java_lang_UNIXProcess_forkAndExec; Java_java_lang_UNIXProcess_destroyProcess; --- ./jdk/make/java/java/reorder-i586 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/java/reorder-i586 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/make/java/java/reorder-i586 2014-07-15 23:24:32.000000000 -0700 @@ -77,7 +77,6 @@ text: .text%JNU_GetEnv; text: .text%Java_java_io_UnixFileSystem_checkAccess; @@ -44867,7 +45624,7 @@ text: .text%Java_java_lang_reflect_Array_newArray; text: .text%Java_java_lang_Throwable_getStackTraceDepth; --- ./jdk/make/java/java/reorder-sparc 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/java/reorder-sparc 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/make/java/java/reorder-sparc 2014-07-15 23:24:32.000000000 -0700 @@ -87,7 +87,6 @@ text: .text%throwFileNotFoundException; text: .text%JNU_NotifyAll; @@ -44877,7 +45634,7 @@ text: .text%JNU_CallMethodByNameV; text: .text%Java_java_io_UnixFileSystem_createDirectory; --- ./jdk/make/java/java/reorder-sparcv9 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/java/reorder-sparcv9 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/make/java/java/reorder-sparcv9 2014-07-15 23:24:32.000000000 -0700 @@ -77,7 +77,6 @@ text: .text%Java_java_security_AccessController_doPrivileged__Ljava_security_PrivilegedAction_2Ljava_security_AccessControlContext_2; text: .text%JNU_GetEnv; @@ -44887,7 +45644,7 @@ text: .text%Java_java_lang_Throwable_getStackTraceDepth; text: .text%Java_java_lang_Throwable_getStackTraceElement; --- ./jdk/make/java/jli/Makefile 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/jli/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/jli/Makefile 2014-07-15 23:24:32.000000000 -0700 @@ -119,9 +119,9 @@ LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"' endif # PLATFORM @@ -44910,7 +45667,7 @@ LDLIBS += -lpthread endif # USE_PTHREADS --- ./jdk/make/java/management/mapfile-vers 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/management/mapfile-vers 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/make/java/management/mapfile-vers 2014-07-15 23:24:32.000000000 -0700 @@ -53,7 +53,7 @@ Java_sun_management_GcInfoBuilder_fillGcAttributeInfo; Java_sun_management_GcInfoBuilder_getLastGcInfo0; @@ -44921,7 +45678,7 @@ Java_sun_management_HotspotThread_getInternalThreadTimes0; Java_sun_management_MemoryImpl_getMemoryManagers0; --- ./jdk/make/java/net/FILES_c.gmk 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/net/FILES_c.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/net/FILES_c.gmk 2014-07-15 23:24:32.000000000 -0700 @@ -24,20 +24,21 @@ # @@ -44970,7 +45727,7 @@ FILES_c += TwoStacksPlainSocketImpl.c FILES_c += DualStackPlainSocketImpl.c --- ./jdk/make/java/net/Makefile 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/net/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/net/Makefile 2014-07-15 23:24:32.000000000 -0700 @@ -83,7 +83,8 @@ # Find platform specific native code # @@ -44991,7 +45748,7 @@ OTHER_CFLAGS += -DDONT_ENABLE_IPV6 endif --- ./jdk/make/java/net/mapfile-vers 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/net/mapfile-vers 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/make/java/net/mapfile-vers 2014-07-15 23:24:32.000000000 -0700 @@ -26,84 +26,86 @@ # Define public interface. @@ -45157,7 +45914,7 @@ + *; }; --- ./jdk/make/java/nio/Makefile 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/nio/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/nio/Makefile 2014-07-15 23:24:32.000000000 -0700 @@ -263,13 +263,89 @@ sun/nio/fs/UnixConstants.java endif # PLATFORM = linux @@ -45299,7 +46056,7 @@ endif include $(BUILDDIR)/common/Mapfile-vers.gmk --- ./jdk/make/java/nio/mapfile-bsd 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/nio/mapfile-bsd 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/nio/mapfile-bsd 2014-07-15 23:24:32.000000000 -0700 @@ -70,6 +70,7 @@ Java_sun_nio_ch_IOUtil_drain; Java_sun_nio_ch_IOUtil_fdVal; @@ -45321,7 +46078,7 @@ Java_sun_nio_ch_KQueuePort_interrupt; Java_sun_nio_ch_KQueuePort_drain1; --- ./jdk/make/java/npt/Makefile 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/npt/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/npt/Makefile 2014-07-15 23:24:32.000000000 -0700 @@ -74,6 +74,14 @@ OTHER_LDLIBS += -liconv endif @@ -45338,7 +46095,7 @@ # Add to ambient vpath so we pick up the library files # --- ./jdk/make/java/redist/fonts/Makefile 2013-09-06 11:27:37.000000000 -0700 -+++ ./jdk/make/java/redist/fonts/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/java/redist/fonts/Makefile 2014-07-15 23:24:32.000000000 -0700 @@ -42,7 +42,7 @@ $(LIBDIR)/fonts/LucidaSansRegular.ttf \ $(LIBDIR)/fonts/LucidaSansDemiBold.ttf \ @@ -45366,8 +46123,18 @@ all build : $(INTERNAL_IMPORT_LIST) +--- ./jdk/make/java/util/FILES_properties.gmk 2013-09-06 11:27:38.000000000 -0700 ++++ ./jdk/make/java/util/FILES_properties.gmk 2014-07-15 23:24:32.000000000 -0700 +@@ -107,6 +107,7 @@ + sun/util/resources/CalendarData_pl.properties \ + sun/util/resources/CalendarData_pt.properties \ + sun/util/resources/CalendarData_pt_PT.properties \ ++ sun/util/resources/CalendarData_pt_BR.properties \ + sun/util/resources/CalendarData_ro.properties \ + sun/util/resources/CalendarData_ru.properties \ + sun/util/resources/CalendarData_sk.properties \ --- ./jdk/make/javax/sound/Makefile 2013-09-06 11:27:38.000000000 -0700 -+++ ./jdk/make/javax/sound/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/javax/sound/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -111,6 +111,21 @@ #MXSPP_ADD = $(PLATFORM)-$(ARCH)/ endif # PLATFORM linux @@ -45391,7 +46158,7 @@ CPPFLAGS += -DUSE_PORTS=TRUE \ -DUSE_DAUDIO=TRUE \ --- ./jdk/make/javax/sound/SoundDefs.gmk 2013-09-06 11:27:38.000000000 -0700 -+++ ./jdk/make/javax/sound/SoundDefs.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/javax/sound/SoundDefs.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -40,6 +40,10 @@ CPPFLAGS += -DX_PLATFORM=X_LINUX endif # PLATFORM linux @@ -45404,7 +46171,7 @@ CPPFLAGS += -DX_PLATFORM=X_MACOSX endif # PLATFORM macosx --- ./jdk/make/javax/sound/jsoundalsa/Makefile 2013-09-06 11:27:38.000000000 -0700 -+++ ./jdk/make/javax/sound/jsoundalsa/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/javax/sound/jsoundalsa/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -51,6 +51,7 @@ $(PORTFILES_c) @@ -45456,7 +46223,7 @@ # # Add to the ambient VPATH. --- ./jdk/make/jpda/transport/socket/Makefile 2013-09-06 11:27:38.000000000 -0700 -+++ ./jdk/make/jpda/transport/socket/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/jpda/transport/socket/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -38,6 +38,11 @@ include $(BUILDDIR)/common/Defs.gmk @@ -45533,7 +46300,7 @@ -FILES_export += \ - com/apple/resources/MacOSXResourceBundle.java --- ./jdk/make/sun/awt/Makefile 2013-09-06 11:27:39.000000000 -0700 -+++ ./jdk/make/sun/awt/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/sun/awt/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -127,7 +127,12 @@ OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL) endif @@ -45621,7 +46388,7 @@ endif --- ./jdk/make/sun/awt/mawt.gmk 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/awt/mawt.gmk 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/sun/awt/mawt.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -169,7 +169,7 @@ OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi endif @@ -45679,7 +46446,7 @@ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \ -I$(OPENWIN_HOME)/include --- ./jdk/make/sun/font/Makefile 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/font/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/sun/font/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -36,7 +36,11 @@ CPLUSPLUSLIBRARY=true @@ -45712,15 +46479,15 @@ OTHER_LDLIBS += -lawt $(LIBM) $(LIBCXX) ifeq ($(OS_VENDOR),Apple) --- ./jdk/make/sun/javazic/tzdata/VERSION 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/VERSION 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/javazic/tzdata/VERSION 2014-07-15 23:24:33.000000000 -0700 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2013d -+tzdata2014b ++tzdata2014c --- ./jdk/make/sun/javazic/tzdata/africa 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/africa 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/javazic/tzdata/africa 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45748,7 +46515,62 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. -@@ -474,6 +474,14 @@ +@@ -358,11 +358,54 @@ + # http://www.worldtimezone.com/dst_news/dst_news_egypt02.html + # </a> + ++# From Ahmad El-Dardiry (2014-05-07): ++# Egypt is to change back to Daylight system on May 15 ++# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx ++ ++# From Gunther Vermier (2015-05-13): ++# our Egypt office confirms that the change will be at 15 May "midnight" (24:00) ++ ++# From Paul Eggert (2014-05-13): ++# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says ++# the change is because of blackouts in Cairo, even though Ahram Online (cited ++# above) says DST had no affect on electricity consumption. The AP story says ++# DST will not be observed during Ramadan. There is no information about when ++# DST will end. See: ++# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 ++# ++# For now, guess that later transitions will use 2010's rules, and that ++# Egypt will agree with Morocco (see below) about the date Ramadan starts and ++# ends, though (unlike Morocco) it will switch at 00:00 standard time. In ++# Egypt the spring-forward transitions are removed for 2020-2022, when the ++# guessed spring-forward date falls during the estimated Ramadan, and all ++# transitions removed for 2023-2038, where the estimated Ramadan falls entirely ++# outside the guessed daylight-saving time. Ramadan intrudes on the guessed ++# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff. ++ + Rule Egypt 2008 only - Aug lastThu 23:00s 0 - + Rule Egypt 2009 only - Aug 20 23:00s 0 - + Rule Egypt 2010 only - Aug 11 0:00 0 - + Rule Egypt 2010 only - Sep 10 0:00 1:00 S + Rule Egypt 2010 only - Sep lastThu 23:00s 0 - ++Rule Egypt 2014 only - May 15 24:00 1:00 S ++Rule Egypt 2014 only - Jun 29 0:00s 0 - ++Rule Egypt 2014 only - Jul 29 0:00s 1:00 S ++Rule Egypt 2014 max - Sep lastThu 23:00s 0 - ++Rule Egypt 2015 2019 - Apr lastFri 0:00s 1:00 S ++Rule Egypt 2015 only - Jun 18 0:00s 0 - ++Rule Egypt 2015 only - Jul 18 0:00s 1:00 S ++Rule Egypt 2016 only - Jun 7 0:00s 0 - ++Rule Egypt 2016 only - Jul 7 0:00s 1:00 S ++Rule Egypt 2017 only - May 27 0:00s 0 - ++Rule Egypt 2017 only - Jun 26 0:00s 1:00 S ++Rule Egypt 2018 only - May 16 0:00s 0 - ++Rule Egypt 2018 only - Jun 15 0:00s 1:00 S ++Rule Egypt 2019 only - May 6 0:00s 0 - ++Rule Egypt 2019 only - Jun 5 0:00s 1:00 S ++Rule Egypt 2020 only - May 24 0:00s 1:00 S ++Rule Egypt 2021 only - May 13 0:00s 1:00 S ++Rule Egypt 2022 only - May 3 0:00s 1:00 S ++Rule Egypt 2023 max - Apr lastFri 0:00s 1:00 S + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Africa/Cairo 2:05:09 - LMT 1900 Oct +@@ -474,6 +517,14 @@ # (either two days before them or five days after them, so as to fall on # lastFri instead of lastSun). @@ -45763,7 +46585,7 @@ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Libya 1951 only - Oct 14 2:00 1:00 S Rule Libya 1952 only - Jan 1 0:00 0 - -@@ -490,8 +498,8 @@ +@@ -490,8 +541,8 @@ Rule Libya 1987 1989 - Oct 1 0:00 0 - Rule Libya 1997 only - Apr 4 0:00 1:00 S Rule Libya 1997 only - Oct 4 0:00 0 - @@ -45774,7 +46596,7 @@ # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Africa/Tripoli 0:52:44 - LMT 1920 1:00 Libya CE%sT 1959 -@@ -502,7 +510,8 @@ +@@ -502,7 +553,8 @@ 2:00 - EET 1996 Sep 30 1:00 Libya CE%sT 1997 Oct 4 2:00 - EET 2012 Nov 10 2:00 @@ -45784,7 +46606,7 @@ # Madagascar # Zone NAME GMTOFF RULES FORMAT [UNTIL] -@@ -707,15 +716,6 @@ +@@ -707,15 +759,6 @@ # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search # </a> @@ -45800,7 +46622,7 @@ # From Steffen Thorsen (2008-08-27): # Morocco will change the clocks back on the midnight between August 31 # and September 1. They originally planned to observe DST to near the end -@@ -881,13 +881,26 @@ +@@ -881,13 +924,26 @@ # transitions would be 2013-07-07 and 2013-08-10; see: # http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 @@ -45830,7 +46652,7 @@ # (let ((a # (calendar-gregorian-from-absolute # (calendar-islamic-to-absolute (list 9 1 islamic-year)))) -@@ -902,13 +915,18 @@ +@@ -902,13 +958,18 @@ # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) # @@ -45856,7 +46678,7 @@ # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S -@@ -935,12 +953,14 @@ +@@ -935,12 +996,14 @@ Rule Morocco 2010 only - Aug 8 0:00 0 - Rule Morocco 2011 only - Apr 3 0:00 1:00 S Rule Morocco 2011 only - Jul 31 0 0 - @@ -45873,7 +46695,7 @@ Rule Morocco 2014 only - Jun 29 3:00 0 - Rule Morocco 2014 only - Jul 29 2:00 1:00 S Rule Morocco 2015 only - Jun 18 3:00 0 - -@@ -953,20 +973,42 @@ +@@ -953,20 +1016,42 @@ Rule Morocco 2018 only - Jun 15 2:00 1:00 S Rule Morocco 2019 only - May 6 3:00 0 - Rule Morocco 2019 only - Jun 5 2:00 1:00 S @@ -45918,7 +46740,7 @@ # Mozambique # Zone NAME GMTOFF RULES FORMAT [UNTIL] -@@ -1123,9 +1165,7 @@ +@@ -1123,9 +1208,7 @@ 3:00 - EAT # South Sudan @@ -45930,7 +46752,7 @@ # Swaziland # Zone NAME GMTOFF RULES FORMAT [UNTIL] --- ./jdk/make/sun/javazic/tzdata/antarctica 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/antarctica 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/javazic/tzdata/antarctica 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46067,7 +46889,7 @@ -Link Antarctica/McMurdo Antarctica/South_Pole +# See 'australasia' for Antarctica/McMurdo. --- ./jdk/make/sun/javazic/tzdata/asia 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/asia 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/javazic/tzdata/asia 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46214,7 +47036,30 @@ # From Ephraim Silverberg # (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17, 2000-07-25, 2004-12-22, -@@ -1386,10 +1408,22 @@ +@@ -1348,22 +1370,6 @@ + # "Jordan will switch to winter time on Friday, October 27". + # + +-# From Phil Pizzey (2009-04-02): +-# ...I think I may have spotted an error in the timezone data for +-# Jordan. +-# The current (2009d) asia file shows Jordan going to daylight +-# saving +-# time on the last Thursday in March. +-# +-# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S +-# +-# However timeanddate.com, which I usually find reliable, shows Jordan +-# going to daylight saving time on the last Friday in March since 2002. +-# Please see +-# <a href="http://www.timeanddate.com/worldclock/timezone.html?n=11"> +-# http://www.timeanddate.com/worldclock/timezone.html?n=11 +-# </a> +- + # From Steffen Thorsen (2009-04-02): + # This single one might be good enough, (2009-03-24, Arabic): + # <a href="http://petra.gov.jo/Artical.aspx?Lng=2&Section=8&Artical=95279"> +@@ -1386,10 +1392,22 @@ # switch back to standard time this winter, so the will stay on DST # until about the same time next year (at least). # http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950 @@ -46241,7 +47086,7 @@ # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Jordan 1973 only - Jun 6 0:00 1:00 S -@@ -1415,12 +1449,14 @@ +@@ -1415,12 +1433,14 @@ Rule Jordan 1999 only - Jul 1 0:00s 1:00 S Rule Jordan 1999 2002 - Sep lastFri 0:00s 0 - Rule Jordan 2000 2001 - Mar lastThu 0:00s 1:00 S @@ -46258,7 +47103,7 @@ # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Amman 2:23:44 - LMT 1931 2:00 Jordan EE%sT -@@ -2303,9 +2339,18 @@ +@@ -2303,9 +2323,18 @@ # http://www.samanews.com/index.php?act=Show&id=154120 # http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html @@ -46279,7 +47124,7 @@ # the predictions in today's editions of the following URLs, # which are for Gaza and Hebron respectively: # http://www.timeanddate.com/worldclock/timezone.html?n=702 -@@ -2336,7 +2381,8 @@ +@@ -2336,7 +2365,8 @@ Rule Palestine 2011 only - Aug 30 0:00 1:00 S Rule Palestine 2011 only - Sep 30 0:00 0 - Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S @@ -46290,7 +47135,7 @@ # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct --- ./jdk/make/sun/javazic/tzdata/australasia 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/australasia 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/javazic/tzdata/australasia 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46407,7 +47252,7 @@ # Kingman # uninhabited --- ./jdk/make/sun/javazic/tzdata/backward 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/backward 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/make/sun/javazic/tzdata/backward 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46470,7 +47315,7 @@ Link Europe/Lisbon Portugal Link Asia/Taipei ROC --- ./jdk/make/sun/javazic/tzdata/etcetera 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/etcetera 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/make/sun/javazic/tzdata/etcetera 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46511,7 +47356,7 @@ # In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for # TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to --- ./jdk/make/sun/javazic/tzdata/europe 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/europe 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/javazic/tzdata/europe 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46966,7 +47811,7 @@ # sometime between the 1994 DST switches. Shanks & Pottenger simply say # 1994-09-25 03:00, but that can't be right. For now, guess it # changed in May. -@@ -2919,7 +2986,14 @@ +@@ -2919,7 +2986,18 @@ # Assume it happened in March by not changing the clocks. 3:00 Russia MSK/MSD 1997 3:00 - MSK 1997 Mar lastSun 1:00u @@ -46974,6 +47819,10 @@ +# From Alexander Krivenyshev (2014-03-17): +# time change at 2:00 (2am) on March 30, 2014 +# http://vz.ru/news/2014/3/17/677464.html ++# From Paul Eggert (2014-03-30): ++# Simferopol and Sevastopol reportedly changed their central town clocks ++# late the previous day, but this appears to have been ceremonial ++# and the discrepancies are small enough to not worry about. + 2:00 EU EE%sT 2014 Mar 30 2:00 + 4:00 - MSK + @@ -46983,7 +47832,7 @@ ############################################################################### --- ./jdk/make/sun/javazic/tzdata/factory 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/factory 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/make/sun/javazic/tzdata/factory 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47012,7 +47861,7 @@ # or visit www.oracle.com if you need additional information or have any # questions. --- ./jdk/make/sun/javazic/tzdata/iso3166.tab 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/iso3166.tab 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/make/sun/javazic/tzdata/iso3166.tab 2014-07-15 23:24:33.000000000 -0700 @@ -1,30 +1,30 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47078,7 +47927,7 @@ BS Bahamas BT Bhutan --- ./jdk/make/sun/javazic/tzdata/leapseconds 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/leapseconds 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/javazic/tzdata/leapseconds 2014-07-15 23:24:33.000000000 -0700 @@ -1,37 +1,43 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47198,7 +48047,7 @@ -# Earth Orientation Center of IERS -# Observatoire de Paris, France --- ./jdk/make/sun/javazic/tzdata/northamerica 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/northamerica 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/javazic/tzdata/northamerica 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47612,7 +48461,7 @@ - -4:00 - AST +# See 'southamerica'. --- ./jdk/make/sun/javazic/tzdata/pacificnew 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/pacificnew 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/make/sun/javazic/tzdata/pacificnew 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47641,7 +48490,7 @@ # or visit www.oracle.com if you need additional information or have any # questions. --- ./jdk/make/sun/javazic/tzdata/solar87 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/solar87 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/make/sun/javazic/tzdata/solar87 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47670,7 +48519,7 @@ # or visit www.oracle.com if you need additional information or have any # questions. --- ./jdk/make/sun/javazic/tzdata/solar88 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/solar88 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/make/sun/javazic/tzdata/solar88 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47699,7 +48548,7 @@ # or visit www.oracle.com if you need additional information or have any # questions. --- ./jdk/make/sun/javazic/tzdata/solar89 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/solar89 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/make/sun/javazic/tzdata/solar89 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47728,7 +48577,7 @@ # or visit www.oracle.com if you need additional information or have any # questions. --- ./jdk/make/sun/javazic/tzdata/southamerica 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/southamerica 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/javazic/tzdata/southamerica 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47943,7 +48792,7 @@ Rule Uruguay 1942 only - Jan 1 0:00 0 - Rule Uruguay 1942 only - Dec 14 0:00 1:00 S --- ./jdk/make/sun/javazic/tzdata/systemv 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/systemv 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/make/sun/javazic/tzdata/systemv 2014-07-15 23:24:33.000000000 -0700 @@ -1,22 +1,22 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47972,7 +48821,7 @@ # or visit www.oracle.com if you need additional information or have any # questions. --- ./jdk/make/sun/javazic/tzdata/zone.tab 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/javazic/tzdata/zone.tab 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/javazic/tzdata/zone.tab 2014-07-15 23:24:33.000000000 -0700 @@ -1,53 +1,55 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48108,7 +48957,7 @@ US +611305-1495401 America/Anchorage Alaska Time US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle --- ./jdk/make/sun/jawt/Makefile 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/jawt/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/sun/jawt/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -99,8 +99,7 @@ # # Other extra flags needed for compiling. @@ -48137,7 +48986,7 @@ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt else --- ./jdk/make/sun/net/FILES_java.gmk 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/net/FILES_java.gmk 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/make/sun/net/FILES_java.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -24,122 +24,123 @@ # @@ -48377,7 +49226,7 @@ FILES_java += sun/net/sdp/SdpProvider.java endif --- ./jdk/make/sun/nio/cs/FILES_java.gmk 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/nio/cs/FILES_java.gmk 2013-12-01 11:14:29.000000000 -0800 ++++ ./jdk/make/sun/nio/cs/FILES_java.gmk 2014-07-15 23:24:33.000000000 -0700 @@ -329,6 +329,7 @@ sun/nio/cs/ext/IBM280.java \ sun/nio/cs/ext/IBM284.java \ @@ -48387,7 +49236,7 @@ sun/nio/cs/ext/IBM420.java \ sun/nio/cs/ext/IBM424.java \ --- ./jdk/make/sun/nio/cs/Makefile 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/nio/cs/Makefile 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/make/sun/nio/cs/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -85,9 +85,6 @@ # # Extra rules to build character converters. @@ -48422,7 +49271,7 @@ @$(java-vm-cleanup) --- ./jdk/make/sun/rmi/rmi/Makefile 2013-09-06 11:27:40.000000000 -0700 -+++ ./jdk/make/sun/rmi/rmi/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/sun/rmi/rmi/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -71,6 +71,9 @@ BUILD_TARGETS += bin endif @@ -48433,8 +49282,25 @@ build: $(BUILD_TARGETS) +--- ./jdk/make/sun/security/ec/mapfile-vers 2013-09-06 11:27:41.000000000 -0700 ++++ ./jdk/make/sun/security/ec/mapfile-vers 2014-07-15 23:24:33.000000000 -0700 +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2009, 2014, 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 +@@ -28,7 +28,6 @@ + SUNWprivate_1.1 { + global: + Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair; +- Java_sun_security_ec_ECKeyPairGenerator_getEncodedBytes; + Java_sun_security_ec_ECDSASignature_signDigest; + Java_sun_security_ec_ECDSASignature_verifySignedDigest; + Java_sun_security_ec_ECDHKeyAgreement_deriveKey; --- ./jdk/make/sun/splashscreen/Makefile 2013-09-06 11:27:41.000000000 -0700 -+++ ./jdk/make/sun/splashscreen/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/sun/splashscreen/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -61,6 +61,12 @@ CFLAGS += -DSPLASHSCREEN @@ -48487,7 +49353,7 @@ OTHER_LDLIBS += $(ZLIB_LIBS) endif --- ./jdk/make/sun/xawt/Makefile 2013-09-06 11:27:41.000000000 -0700 -+++ ./jdk/make/sun/xawt/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/sun/xawt/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -52,6 +52,9 @@ AUTO_JAVA_PRUNE = WrapperGenerator.java @@ -48541,7 +49407,7 @@ CPPFLAGS += -DX11_PATH=\"$(X11_PATH)\" -DPACKAGE_PATH=\"$(PACKAGE_PATH)\" endif --- ./jdk/make/tools/CharsetMapping/IBM290.c2b 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/make/tools/CharsetMapping/IBM290.c2b 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/make/tools/CharsetMapping/IBM290.c2b 2014-07-15 23:24:33.000000000 -0700 @@ -0,0 +1,100 @@ +# +# Diff of @@ -48644,7 +49510,7 @@ +0xF8 U+FF18 +0xF9 U+FF19 --- ./jdk/make/tools/CharsetMapping/IBM290.map 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/make/tools/CharsetMapping/IBM290.map 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/make/tools/CharsetMapping/IBM290.map 2014-07-15 23:24:33.000000000 -0700 @@ -0,0 +1,232 @@ +# +# b2c mapping for IBM290, generated from @@ -48879,7 +49745,7 @@ +0xF9 U+0039 +0xFF U+009F --- ./jdk/make/tools/CharsetMapping/extsbcs 2013-09-06 11:27:42.000000000 -0700 -+++ ./jdk/make/tools/CharsetMapping/extsbcs 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/make/tools/CharsetMapping/extsbcs 2014-07-15 23:24:33.000000000 -0700 @@ -28,6 +28,7 @@ IBM280 IBM280 Cp280 false sun.nio.cs.ext IBM284 IBM284 Cp284 false sun.nio.cs.ext @@ -48889,7 +49755,7 @@ IBM420 IBM420 Cp420 false sun.nio.cs.ext IBM424 IBM424 Cp424 false sun.nio.cs.ext --- ./jdk/make/tools/freetypecheck/Makefile 2013-09-06 11:27:43.000000000 -0700 -+++ ./jdk/make/tools/freetypecheck/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/tools/freetypecheck/Makefile 2014-07-15 23:24:33.000000000 -0700 @@ -52,8 +52,15 @@ else ifeq ($(PLATFORM), macosx) @@ -48909,7 +49775,7 @@ endif endif --- ./jdk/make/tools/sharing/classlist.bsd 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/make/tools/sharing/classlist.bsd 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/make/tools/sharing/classlist.bsd 2014-07-15 23:24:33.000000000 -0700 @@ -0,0 +1,2327 @@ +java/lang/Object +java/lang/String @@ -51239,7 +52105,7 @@ +javax/swing/BufferStrategyPaintManager$1 +# f3ac8b467e7f8c49 --- ./jdk/src/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java 2013-09-06 11:27:48.000000000 -0700 -+++ ./jdk/src/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/classes/com/apple/eawt/_AppMenuBarHandler.java 2014-07-15 23:24:33.000000000 -0700 @@ -31,6 +31,7 @@ import javax.swing.*; import javax.swing.plaf.MenuBarUI; @@ -51284,7 +52150,7 @@ void setAboutMenuItemVisible(final boolean present) { --- ./jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java 2013-09-06 11:27:48.000000000 -0700 -+++ ./jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java 2013-12-01 11:14:34.000000000 -0800 ++++ ./jdk/src/macosx/classes/com/apple/laf/AquaLookAndFeel.java 2014-07-15 23:24:33.000000000 -0700 @@ -37,8 +37,6 @@ import sun.swing.*; import apple.laf.*; @@ -51304,7 +52170,7 @@ while (propertyKeys.hasMoreElements()) { --- ./jdk/src/macosx/classes/com/apple/laf/AquaUtils.java 2013-09-06 11:27:48.000000000 -0700 -+++ ./jdk/src/macosx/classes/com/apple/laf/AquaUtils.java 2013-12-01 11:14:34.000000000 -0800 ++++ ./jdk/src/macosx/classes/com/apple/laf/AquaUtils.java 2014-07-15 23:24:33.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -51753,7 +52619,7 @@ return; } --- ./jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java 2013-09-06 11:27:48.000000000 -0700 -+++ ./jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java 2013-12-01 11:14:34.000000000 -0800 ++++ ./jdk/src/macosx/classes/com/apple/laf/ScreenMenu.java 2014-07-15 23:24:33.000000000 -0700 @@ -37,26 +37,31 @@ import sun.lwawt.LWToolkit; import sun.lwawt.macosx.*; @@ -52048,7 +52914,7 @@ MenuItem sm = fItems.get(m); --- ./jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties 2013-09-06 11:27:48.000000000 -0700 -+++ ./jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/macosx/classes/com/apple/laf/resources/aqua_ko.properties 2014-07-15 23:24:33.000000000 -0700 @@ -46,7 +46,7 @@ FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30 FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5 @@ -52172,7 +53038,7 @@ -} - --- ./jdk/src/macosx/classes/sun/awt/resources/awtosx.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/macosx/classes/sun/awt/resources/awtosx.properties 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/awt/resources/awtosx.properties 2014-07-15 23:24:33.000000000 -0700 @@ -0,0 +1,71 @@ +# +# OS X specific AWT properties @@ -52246,7 +53112,7 @@ +AWT.numpad=\u2328 + --- ./jdk/src/macosx/classes/sun/font/CFontManager.java 2013-09-06 11:27:48.000000000 -0700 -+++ ./jdk/src/macosx/classes/sun/font/CFontManager.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/font/CFontManager.java 2014-07-15 23:24:33.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -52305,7 +53171,7 @@ } } --- ./jdk/src/macosx/classes/sun/font/CStrike.java 2013-09-06 11:27:48.000000000 -0700 -+++ ./jdk/src/macosx/classes/sun/font/CStrike.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/font/CStrike.java 2014-07-15 23:24:33.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -52500,7 +53366,7 @@ this.cache = new float[1 << shift][]; this.secondLayerLength = size >> shift; --- ./jdk/src/macosx/classes/sun/lwawt/LWToolkit.java 2013-09-06 11:27:49.000000000 -0700 -+++ ./jdk/src/macosx/classes/sun/lwawt/LWToolkit.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/lwawt/LWToolkit.java 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. @@ -52557,7 +53423,7 @@ toolkitThread.setPriority(Thread.NORM_PRIORITY + 1); toolkitThread.start(); --- ./jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java 2013-09-06 11:27:49.000000000 -0700 -+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CClipboard.java 2014-07-15 23:24:34.000000000 -0700 @@ -53,7 +53,7 @@ } @@ -52568,7 +53434,7 @@ // If we did that, we would call Transferable.getTransferData on // the Toolkit thread, which is a security hole. --- ./jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java 2013-09-06 11:27:49.000000000 -0700 -+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CDropTargetContextPeer.java 2014-07-15 23:24:34.000000000 -0700 @@ -26,6 +26,7 @@ package sun.lwawt.macosx; @@ -52682,7 +53548,7 @@ protected int postDropTargetEvent(Component component, int x, int y, int dropAction, int actions, long[] formats, long nativeCtxt, int eventID, --- ./jdk/src/macosx/classes/sun/lwawt/macosx/CInputMethod.java 2013-09-06 11:27:49.000000000 -0700 -+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CInputMethod.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CInputMethod.java 2014-07-15 23:24:34.000000000 -0700 @@ -620,8 +620,7 @@ retString[0] = new String(selectedText); }} @@ -52734,7 +53600,7 @@ // This bit of gymnastics ensures that the returned location is within the composed text. // If it falls outside that region, the input method will commit the text, which is inconsistent with native --- ./jdk/src/macosx/classes/sun/lwawt/macosx/CMenuComponent.java 2013-09-06 11:27:49.000000000 -0700 -+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CMenuComponent.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CMenuComponent.java 2014-07-15 23:24:34.000000000 -0700 @@ -43,7 +43,7 @@ return target; } @@ -52745,7 +53611,7 @@ } --- ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java 2013-09-06 11:27:49.000000000 -0700 -+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java 2014-07-15 23:24:34.000000000 -0700 @@ -918,7 +918,7 @@ //Posting an empty to flush the EventQueue without blocking the main thread } @@ -52756,7 +53622,7 @@ } } --- ./jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java 2013-09-06 11:27:49.000000000 -0700 -+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/CViewEmbeddedFrame.java 2014-07-15 23:24:34.000000000 -0700 @@ -97,6 +97,6 @@ setVisible(true); } @@ -52766,7 +53632,7 @@ } } --- ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java 2013-09-06 11:27:49.000000000 -0700 -+++ ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java 2014-07-15 23:24:34.000000000 -0700 @@ -44,6 +44,8 @@ import sun.lwawt.LWWindowPeer.PeerType; import sun.security.action.GetBooleanAction; @@ -52859,7 +53725,7 @@ if (component != null) { AppContext appContext = SunToolkit.targetToAppContext(component); --- ./jdk/src/macosx/lib/flavormap.properties 2013-09-06 11:27:49.000000000 -0700 -+++ ./jdk/src/macosx/lib/flavormap.properties 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/lib/flavormap.properties 2014-07-15 23:24:34.000000000 -0700 @@ -76,5 +76,6 @@ text/uri-list=application/x-java-file-list;class=java.util.List PNG=image/x-java-image;class=java.awt.Image @@ -52981,7 +53847,7 @@ - return returnVal; -} --- ./jdk/src/macosx/native/java/util/SCDynamicStoreConfig.m 2013-09-06 11:27:49.000000000 -0700 -+++ ./jdk/src/macosx/native/java/util/SCDynamicStoreConfig.m 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/native/java/util/SCDynamicStoreConfig.m 2014-07-15 23:24:34.000000000 -0700 @@ -103,7 +103,6 @@ CFTypeRef realmInfo = SCDynamicStoreCopyValue(store, (CFStringRef) [NSString stringWithFormat:@"Kerberos:%@", realm]); @@ -53027,7 +53893,7 @@ CFRelease(realms); CFRelease(store); --- ./jdk/src/macosx/native/sun/awt/AWTEvent.m 2013-09-06 11:27:50.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/awt/AWTEvent.m 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/awt/AWTEvent.m 2014-07-15 23:24:34.000000000 -0700 @@ -382,7 +382,7 @@ { TISInputSourceRef currentKeyboard = TISCopyCurrentKeyboardInputSource(); @@ -53038,7 +53904,7 @@ // Carbon modifiers should be used instead of NSEvent modifiers UInt32 modifierKeyState = (GetCurrentEventKeyModifiers() >> 8) & 0xFF; --- ./jdk/src/macosx/native/sun/awt/AWTWindow.m 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/awt/AWTWindow.m 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/awt/AWTWindow.m 2014-07-15 23:24:34.000000000 -0700 @@ -30,6 +30,7 @@ #import "sun_lwawt_macosx_CPlatformWindow.h" #import "com_apple_eawt_event_GestureHandler.h" @@ -53114,7 +53980,7 @@ }]; --- ./jdk/src/macosx/native/sun/awt/CDropTarget.m 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/awt/CDropTarget.m 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/awt/CDropTarget.m 2014-07-15 23:24:34.000000000 -0700 @@ -477,6 +477,8 @@ sDraggingExited = FALSE; sDraggingLocation = [sender draggingLocation]; @@ -53135,7 +54001,7 @@ jlongArray formats = sDraggingFormats; --- ./jdk/src/macosx/native/sun/awt/CMenuItem.m 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/awt/CMenuItem.m 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/awt/CMenuItem.m 2014-07-15 23:24:34.000000000 -0700 @@ -70,9 +70,15 @@ JNIEnv *env = [ThreadUtilities getJNIEnv]; JNF_COCOA_ENTER(env); @@ -53175,7 +54041,7 @@ case java_awt_event_KeyEvent_VK_DELETE : macKey = NSDeleteCharacter; break; case java_awt_event_KeyEvent_VK_CLEAR : macKey = NSClearDisplayFunctionKey; break; --- ./jdk/src/macosx/native/sun/awt/LWCToolkit.m 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/awt/LWCToolkit.m 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/awt/LWCToolkit.m 2014-07-15 23:24:34.000000000 -0700 @@ -193,8 +193,8 @@ JNIEnv *env = [ThreadUtilities getJNIEnv]; @@ -53188,7 +54054,7 @@ gNumberOfButtons = sun_lwawt_macosx_LWCToolkit_BUTTONS; --- ./jdk/src/macosx/native/sun/awt/awt.m 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/awt/awt.m 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/awt/awt.m 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -53214,7 +54080,7 @@ // We need to let Foundation know that this is a multithreaded application, if it isn't already. --- ./jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m 2014-07-15 23:24:34.000000000 -0700 @@ -290,8 +290,8 @@ SplashUnlock(splash); rc = poll(pfd, 1, timeout); @@ -53227,7 +54093,7 @@ SplashRedrawWindow(splash); } --- ./jdk/src/macosx/native/sun/font/AWTStrike.h 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/font/AWTStrike.h 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/font/AWTStrike.h 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -53251,7 +54117,7 @@ CGAffineTransform fFontTx; } --- ./jdk/src/macosx/native/sun/font/AWTStrike.m 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/font/AWTStrike.m 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/font/AWTStrike.m 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -53289,7 +54155,7 @@ JNF_COCOA_EXIT(env); return advance.width; --- ./jdk/src/macosx/native/sun/font/CGGlyphImages.m 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/font/CGGlyphImages.m 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/font/CGGlyphImages.m 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -53350,7 +54216,7 @@ if (maxWidth < glyphInfo->width) maxWidth = glyphInfo->width; if (maxHeight < glyphInfo->height) maxHeight = glyphInfo->height; --- ./jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/osxapp/ThreadUtilities.h 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -53368,7 +54234,7 @@ //Wrappers for the corresponding JNFRunLoop methods with a check for main thread + (void)performOnMainThreadWaiting:(BOOL)wait block:(void (^)())block; --- ./jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/macosx/native/sun/osxapp/ThreadUtilities.m 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -53424,7 +54290,7 @@ if ([NSThread isMainThread] && wait == YES) { block(); --- ./jdk/src/share/back/SDE.c 2013-09-06 11:27:51.000000000 -0700 -+++ ./jdk/src/share/back/SDE.c 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/share/back/SDE.c 2014-07-15 23:24:37.000000000 -0700 @@ -28,6 +28,12 @@ #include "util.h" #include "SDE.h" @@ -53439,7 +54305,7 @@ * This SourceDebugExtension code does not * allow concurrent translation - due to caching method. --- ./jdk/src/share/back/export/sys.h 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/back/export/sys.h 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/share/back/export/sys.h 2014-07-15 23:24:37.000000000 -0700 @@ -37,7 +37,7 @@ /* Implemented in linker_md.c */ @@ -53450,7 +54316,7 @@ void dbgsysUnloadLibrary(void *); void * dbgsysFindLibraryEntry(void *, const char *); --- ./jdk/src/share/back/transport.c 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/back/transport.c 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/share/back/transport.c 2014-07-15 23:24:37.000000000 -0700 @@ -97,12 +97,12 @@ /* Load transport library (directory=="" means do system search) */ @@ -53492,7 +54358,7 @@ /* Make sure library name is not empty */ if (name == NULL) { --- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_de.properties 2014-07-15 23:24:37.000000000 -0700 @@ -17,7 +17,7 @@ awtcomponent=AWT-Komponente checkbox=Kontrollk\u00E4stchen @@ -53521,7 +54387,7 @@ # new relations, roles and states for J2SE 1.5.0 --- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_es.properties 2014-07-15 23:24:37.000000000 -0700 @@ -102,7 +102,7 @@ # # accessible actions @@ -53532,7 +54398,7 @@ # new relations, roles and states for J2SE 1.5.0 --- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_fr.properties 2014-07-15 23:24:37.000000000 -0700 @@ -102,7 +102,7 @@ # # accessible actions @@ -53543,7 +54409,7 @@ # new relations, roles and states for J2SE 1.5.0 --- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_it.properties 2014-07-15 23:24:37.000000000 -0700 @@ -102,7 +102,7 @@ # # accessible actions @@ -53554,7 +54420,7 @@ # new relations, roles and states for J2SE 1.5.0 --- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_pt_BR.properties 2014-07-15 23:24:37.000000000 -0700 @@ -102,7 +102,7 @@ # # accessible actions @@ -53565,7 +54431,7 @@ # new relations, roles and states for J2SE 1.5.0 --- ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/accessibility/internal/resources/accessibility_sv.properties 2014-07-15 23:24:37.000000000 -0700 @@ -102,7 +102,7 @@ # # accessible actions @@ -53576,7 +54442,7 @@ # new relations, roles and states for J2SE 1.5.0 --- ./jdk/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. @@ -53606,7 +54472,7 @@ * * @param type the base class --- ./jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-07-15 23:24:37.000000000 -0700 @@ -29,6 +29,7 @@ import java.beans.ExceptionListener; @@ -53631,7 +54497,7 @@ */ @Override --- ./jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/beans/finder/ConstructorFinder.java 2014-07-15 23:24:37.000000000 -0700 @@ -24,11 +24,12 @@ */ package com.sun.beans.finder; @@ -53687,7 +54553,7 @@ /** --- ./jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/beans/finder/MethodFinder.java 2014-07-15 23:24:37.000000000 -0700 @@ -25,7 +25,7 @@ package com.sun.beans.finder; @@ -53748,7 +54614,7 @@ /** --- ./jdk/src/share/classes/com/sun/beans/finder/Signature.java 2013-09-06 11:27:52.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/beans/finder/Signature.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/beans/finder/Signature.java 2014-07-15 23:24:37.000000000 -0700 @@ -62,6 +62,18 @@ this.args = args; } @@ -53769,7 +54635,7 @@ * Indicates whether some other object is "equal to" this one. * --- ./jdk/src/share/classes/com/sun/beans/finder/SignatureException.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/classes/com/sun/beans/finder/SignatureException.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/beans/finder/SignatureException.java 2014-07-15 23:24:37.000000000 -0700 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -53813,7 +54679,7 @@ + } +} --- ./jdk/src/share/classes/com/sun/beans/util/Cache.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-07-15 23:24:37.000000000 -0700 @@ -0,0 +1,613 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -54429,7 +55295,7 @@ + } +} --- ./jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java 2013-09-06 11:27:53.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/crypto/provider/DHKeyAgreement.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. @@ -54450,7 +55316,7 @@ throw new NoSuchAlgorithmException("Unsupported secret key " + "algorithm: "+ algorithm); --- ./jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java 2013-09-06 11:27:53.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java 2013-12-01 11:14:37.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/crypto/provider/DHPrivateKey.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -54482,7 +55348,7 @@ try { DerInputStream in = new DerInputStream(this.key); --- ./jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java 2013-09-06 11:27:53.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. @@ -54515,7 +55381,7 @@ } --- ./jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java 2013-09-06 11:27:53.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java 2013-12-01 11:14:37.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/demo/jvmti/hprof/Tracker.java 2014-07-15 23:24:37.000000000 -0700 @@ -53,7 +53,10 @@ public static void ObjectInit(Object obj) @@ -54571,7 +55437,7 @@ } } --- ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-09-06 11:27:53.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2013-12-01 11:14:37.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java 2014-07-15 23:24:37.000000000 -0700 @@ -1160,6 +1160,11 @@ target = imRas; } @@ -54585,7 +55451,7 @@ /* * If the process is sequential, and we have restart markers, --- ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-09-06 11:27:53.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2013-12-01 11:14:37.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2014-07-15 23:24:37.000000000 -0700 @@ -490,8 +490,8 @@ // handle <= 8-bit samples. We now check the band sizes and throw // an exception for images, such as USHORT_GRAY, with > 8 bits @@ -54598,7 +55464,7 @@ // 4450894 part 2: We expand IndexColorModel images to full 24- // or 32-bit in grabPixels() for each scanline. For indexed --- ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java 2013-09-06 11:27:53.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved. @@ -54622,7 +55488,7 @@ } else { newGuy = new MarkerSegment(buffer); --- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties 2013-09-06 11:27:54.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/resources/gtk_de.properties 2014-07-15 23:24:37.000000000 -0700 @@ -41,7 +41,7 @@ FileChooser.openDialogTitle.textAndMnemonic=\u00D6ffnen FileChooser.pathLabel.textAndMnemonic=Aus&wahl: @@ -54633,7 +55499,7 @@ FileChooser.cancelButtonToolTip.textAndMnemonic=Dialogfeld f\u00FCr Dateiauswahl schlie\u00DFen. --- ./jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties 2013-09-06 11:27:54.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/motif/resources/motif_ko.properties 2014-07-15 23:24:37.000000000 -0700 @@ -24,7 +24,7 @@ FileChooser.openButton.textAndMnemonic=\uD655\uC778 FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5 @@ -54651,7 +55517,7 @@ +FileChooser.updateButtonToolTip.textAndMnemonic=\uB514\uB809\uD1A0\uB9AC \uBAA9\uB85D\uC744 \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4. FileChooser.helpButtonToolTip.textAndMnemonic=FileChooser \uB3C4\uC6C0\uB9D0\uC785\uB2C8\uB2E4. --- ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties 2013-09-06 11:27:55.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/windows/resources/windows_fr.properties 2014-07-15 23:24:37.000000000 -0700 @@ -25,8 +25,8 @@ FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier : FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau. @@ -54664,7 +55530,7 @@ FileChooser.newFolderAccessibleName=Nouveau dossier FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier --- ./jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java 2013-09-06 11:27:55.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/Code.java 2014-07-15 23:24:37.000000000 -0700 @@ -146,7 +146,6 @@ int verbose = getPackage().verbose; if (verbose > 2) @@ -54674,7 +55540,7 @@ if (fixups != null) { fixups.visitRefs(refs); --- ./jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2013-09-06 11:27:55.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-07-15 23:24:37.000000000 -0700 @@ -670,53 +670,55 @@ return new String(sig); } @@ -54772,7 +55638,7 @@ //assert(flattenSignature(parts).equals(sig)); return parts; --- ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_ja.java 2014-07-15 23:24:37.000000000 -0700 @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. @@ -54906,7 +55772,7 @@ + +} --- ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/java/util/jar/pack/DriverResource_zh_CN.java 2014-07-15 23:24:37.000000000 -0700 @@ -0,0 +1,131 @@ +/* + * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. @@ -55040,7 +55906,7 @@ + +} --- ./jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java 2013-09-06 11:27:56.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java 2013-12-01 11:14:38.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/jmx/remote/protocol/iiop/IIOPProxyImpl.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. @@ -55112,39 +55978,92 @@ } } --- ./jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2013-09-06 11:27:56.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-04-19 01:27:12.000000000 -0700 -@@ -35,6 +35,8 @@ ++++ ./jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-07-15 23:24:37.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2003, 2014, 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 +@@ -34,81 +34,37 @@ + import javax.management.remote.SubjectDelegationPermission; - import com.sun.jmx.remote.util.CacheMap; -+import java.util.ArrayList; -+import java.util.Collection; +-import com.sun.jmx.remote.util.CacheMap; ++import java.util.*; public class SubjectDelegator { - private static final int PRINCIPALS_CACHE_SIZE = 10; -@@ -53,11 +55,14 @@ +- private static final int PRINCIPALS_CACHE_SIZE = 10; +- private static final int ACC_CACHE_SIZE = 10; +- +- private CacheMap<Subject, Principal[]> principalsCache; +- private CacheMap<Subject, AccessControlContext> accCache; +- + /* Return the AccessControlContext appropriate to execute an + operation on behalf of the delegatedSubject. If the + authenticatedAccessControlContext does not have permission to + delegate to that subject, throw SecurityException. */ +- public synchronized AccessControlContext ++ public AccessControlContext + delegatedContext(AccessControlContext authenticatedACC, + Subject delegatedSubject, boolean removeCallerContext) throws SecurityException { -+ if (System.getSecurityManager() != null && authenticatedACC == null) { -+ throw new SecurityException("Illegal AccessControlContext: null"); -+ } - if (principalsCache == null || accCache == null) { - principalsCache = +- if (principalsCache == null || accCache == null) { +- principalsCache = - new CacheMap<Subject, Principal[]>(PRINCIPALS_CACHE_SIZE); -+ new CacheMap<>(PRINCIPALS_CACHE_SIZE); - accCache = +- accCache = - new CacheMap<Subject, AccessControlContext>(ACC_CACHE_SIZE); -+ new CacheMap<>(ACC_CACHE_SIZE); +- } +- +- // Retrieve the principals for the given +- // delegated subject from the cache +- // +- Principal[] delegatedPrincipals = principalsCache.get(delegatedSubject); +- +- // Convert the set of principals stored in the +- // delegated subject into an array of principals +- // and store it in the cache +- // +- if (delegatedPrincipals == null) { +- delegatedPrincipals = +- delegatedSubject.getPrincipals().toArray(new Principal[0]); +- principalsCache.put(delegatedSubject, delegatedPrincipals); +- } +- +- // Retrieve the access control context for the +- // given delegated subject from the cache +- // +- AccessControlContext delegatedACC = accCache.get(delegatedSubject); +- +- // Build the access control context to be used +- // when executing code as the delegated subject +- // and store it in the cache +- // +- if (delegatedACC == null) { +- if (removeCallerContext) { +- delegatedACC = +- JMXSubjectDomainCombiner.getDomainCombinerContext( +- delegatedSubject); +- } else { +- delegatedACC = +- JMXSubjectDomainCombiner.getContext(delegatedSubject); +- } +- accCache.put(delegatedSubject, delegatedACC); ++ if (System.getSecurityManager() != null && authenticatedACC == null) { ++ throw new SecurityException("Illegal AccessControlContext: null"); } - // Retrieve the principals for the given -@@ -101,14 +106,15 @@ + // Check if the subject delegation permission allows the + // authenticated subject to assume the identity of each // principal in the delegated subject // - final Principal[] dp = delegatedPrincipals; -+ final Collection<Permission> permissions = new ArrayList<>(dp.length); -+ for(Principal p : dp) { +- final Principal[] dp = delegatedPrincipals; ++ Collection<Principal> ps = getSubjectPrincipals(delegatedSubject); ++ final Collection<Permission> permissions = new ArrayList<>(ps.size()); ++ for(Principal p : ps) { + final String pname = p.getClass().getName() + "." + p.getName(); + permissions.add(new SubjectDelegationPermission(pname)); + } @@ -55160,8 +56079,183 @@ AccessController.checkPermission(sdp); } return null; +@@ -116,7 +72,15 @@ + }; + AccessController.doPrivileged(action, authenticatedACC); + +- return delegatedACC; ++ return getDelegatedAcc(delegatedSubject, removeCallerContext); ++ } ++ ++ private AccessControlContext getDelegatedAcc(Subject delegatedSubject, boolean removeCallerContext) { ++ if (removeCallerContext) { ++ return JMXSubjectDomainCombiner.getDomainCombinerContext(delegatedSubject); ++ } else { ++ return JMXSubjectDomainCombiner.getContext(delegatedSubject); ++ } + } + + /** +@@ -131,11 +95,9 @@ + public static synchronized boolean + checkRemoveCallerContext(Subject subject) { + try { +- final Principal[] dp = +- subject.getPrincipals().toArray(new Principal[0]); +- for (int i = 0 ; i < dp.length ; i++) { ++ for (Principal p : getSubjectPrincipals(subject)) { + final String pname = +- dp[i].getClass().getName() + "." + dp[i].getName(); ++ p.getClass().getName() + "." + p.getName(); + final Permission sdp = + new SubjectDelegationPermission(pname); + AccessController.checkPermission(sdp); +@@ -145,4 +107,19 @@ + } + return true; + } ++ ++ /** ++ * Retrieves the {@linkplain Subject} principals ++ * @param subject The subject ++ * @return If the {@code Subject} is immutable it will return the principals directly. ++ * If the {@code Subject} is mutable it will create an unmodifiable copy. ++ */ ++ private static Collection<Principal> getSubjectPrincipals(Subject subject) { ++ if (subject.isReadOnly()) { ++ return subject.getPrincipals(); ++ } ++ ++ List<Principal> principals = Arrays.asList(subject.getPrincipals().toArray(new Principal[0])); ++ return Collections.unmodifiableList(principals); ++ } + } +--- ./jdk/src/share/classes/com/sun/jmx/remote/util/CacheMap.java 2013-09-06 11:27:56.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/jmx/remote/util/CacheMap.java 1969-12-31 16:00:00.000000000 -0800 +@@ -1,121 +0,0 @@ +-/* +- * Copyright (c) 2003, 2006, 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. Oracle designates this +- * particular file as subject to the "Classpath" exception as provided +- * by Oracle in the LICENSE file that accompanied this code. +- * +- * 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 if you need additional information or have any +- * questions. +- */ +- +-package com.sun.jmx.remote.util; +- +-import java.lang.ref.SoftReference; +-import java.util.Iterator; +-import java.util.LinkedList; +-import java.util.List; +-import java.util.WeakHashMap; +- +-import com.sun.jmx.mbeanserver.Util; +- +-/** +- * <p>Like WeakHashMap, except that the keys of the <em>n</em> most +- * recently-accessed entries are kept as {@link SoftReference soft +- * references}. Accessing an element means creating it, or retrieving +- * it with {@link #get(Object) get}. Because these entries are kept +- * with soft references, they will tend to remain even if their keys +- * are not referenced elsewhere. But if memory is short, they will +- * be removed.</p> +- */ +-public class CacheMap<K, V> extends WeakHashMap<K, V> { +- /** +- * <p>Create a <code>CacheMap</code> that can keep up to +- * <code>nSoftReferences</code> as soft references.</p> +- * +- * @param nSoftReferences Maximum number of keys to keep as soft +- * references. Access times for {@link #get(Object) get} and +- * {@link #put(Object, Object) put} have a component that scales +- * linearly with <code>nSoftReferences</code>, so this value +- * should not be too great. +- * +- * @throws IllegalArgumentException if +- * <code>nSoftReferences</code> is negative. +- */ +- public CacheMap(int nSoftReferences) { +- if (nSoftReferences < 0) { +- throw new IllegalArgumentException("nSoftReferences = " + +- nSoftReferences); +- } +- this.nSoftReferences = nSoftReferences; +- } +- +- public V put(K key, V value) { +- cache(key); +- return super.put(key, value); +- } +- +- public V get(Object key) { +- cache(Util.<K>cast(key)); +- return super.get(key); +- } +- +- /* We don't override remove(Object) or try to do something with +- the map's iterators to detect removal. So we may keep useless +- entries in the soft reference list for keys that have since +- been removed. The assumption is that entries are added to the +- cache but never removed. But the behavior is not wrong if +- they are in fact removed -- the caching is just less +- performant. */ +- +- private void cache(K key) { +- Iterator<SoftReference<K>> it = cache.iterator(); +- while (it.hasNext()) { +- SoftReference<K> sref = it.next(); +- K key1 = sref.get(); +- if (key1 == null) +- it.remove(); +- else if (key.equals(key1)) { +- // Move this element to the head of the LRU list +- it.remove(); +- cache.add(0, sref); +- return; +- } +- } +- +- int size = cache.size(); +- if (size == nSoftReferences) { +- if (size == 0) +- return; // degenerate case, equivalent to WeakHashMap +- it.remove(); +- } +- +- cache.add(0, new SoftReference<K>(key)); +- } +- +- /* List of soft references for the most-recently referenced keys. +- The list is in most-recently-used order, i.e. the first element +- is the most-recently referenced key. There are never more than +- nSoftReferences elements of this list. +- +- If we didn't care about J2SE 1.3 compatibility, we could use +- LinkedHashSet in conjunction with a subclass of SoftReference +- whose equals and hashCode reflect the referent. */ +- private final LinkedList<SoftReference<K>> cache = +- new LinkedList<SoftReference<K>>(); +- private final int nSoftReferences; +-} --- ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java 2013-09-06 11:27:57.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java 2014-07-15 23:24:37.000000000 -0700 @@ -27,17 +27,9 @@ // java imports @@ -55191,7 +56285,7 @@ /** --- ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java 2013-09-06 11:27:57.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java 2014-07-15 23:24:37.000000000 -0700 @@ -116,7 +116,7 @@ public void validateVarId(long arc, Object userData) throws SnmpStatusException { @@ -55258,7 +56352,7 @@ } catch (SnmpStatusException e) { // We didn't find anything at the given arc, so we're going --- ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java 2013-09-06 11:27:57.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java 2014-07-15 23:24:37.000000000 -0700 @@ -155,7 +155,7 @@ long[] oid, int depth, SnmpRequestTree handlers) @@ -55316,7 +56410,7 @@ - new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName); } --- ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java 2013-09-06 11:27:57.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java 2014-07-15 23:24:37.000000000 -0700 @@ -157,11 +157,11 @@ if (depth > length) { @@ -55376,7 +56470,7 @@ } --- ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java 2013-09-06 11:27:57.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java 2014-07-15 23:24:37.000000000 -0700 @@ -279,7 +279,7 @@ SnmpVarBind var = null; for (Enumeration e= r.getElements(); e.hasMoreElements();) { @@ -55507,7 +56601,7 @@ } --- ./jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java 2013-09-06 11:27:58.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java 2014-07-15 23:24:37.000000000 -0700 @@ -1146,7 +1146,4 @@ static final private String InterruptSysCallMsg = @@ -55517,7 +56611,7 @@ - new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName) ; } --- ./jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java 2013-09-06 11:27:58.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/jndi/dns/DnsClient.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. @@ -55726,7 +56820,7 @@ } } --- ./jdk/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java 2013-09-06 11:27:58.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/jndi/ldap/LdapBindingEnumeration.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. @@ -55782,7 +56876,7 @@ if (obj == null) { // DirContext object --- ./jdk/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java 2013-09-06 11:27:58.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/jndi/ldap/LdapSearchEnumeration.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2003, Oracle and/or its affiliates. All rights reserved. @@ -55839,7 +56933,7 @@ if (obj == null) { obj = new LdapCtx(homeCtx, dn); --- ./jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java 2013-09-06 11:27:58.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java 2013-12-01 11:14:38.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/jndi/ldap/VersionHelper12.java 2014-07-15 23:24:37.000000000 -0700 @@ -25,11 +25,12 @@ package com.sun.jndi.ldap; @@ -55877,7 +56971,7 @@ } } --- ./jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java 2013-09-06 11:27:59.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java 2013-12-01 11:14:38.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java 2014-07-15 23:24:37.000000000 -0700 @@ -66,6 +66,11 @@ * cannot be created, opened, or written to. * @throws UnsupportedOperationException if this operation is not supported. @@ -55891,7 +56985,7 @@ public void dumpHeap(String outputFile, boolean live) throws java.io.IOException; --- ./jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2013-09-06 11:27:59.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2014-07-15 23:24:37.000000000 -0700 @@ -25,27 +25,33 @@ package com.sun.media.sound; @@ -56067,7 +57161,7 @@ - } } --- ./jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java 2013-09-06 11:27:59.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/media/sound/JSSecurityManager.java 2014-07-15 23:24:37.000000000 -0700 @@ -187,7 +187,7 @@ return thread; } @@ -56078,7 +57172,7 @@ // Service.providers(Class) just creates "lazy" iterator instance, // so it doesn't require do be called from privileged section --- ./jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2013-09-06 11:28:00.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved. @@ -56126,7 +57220,7 @@ // Instantiate Class to get factory answer = ((Class) answer).newInstance(); --- ./jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2013-09-06 11:28:00.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/naming/internal/ResourceManager.java 2014-07-15 23:24:37.000000000 -0700 @@ -69,6 +69,14 @@ private static final String JRELIB_PROPERTY_FILE_NAME = "jndi.properties"; @@ -56157,7 +57251,7 @@ // resource files. Colon-separated lists are concatenated. mergeTables(env, getApplicationResources()); --- ./jdk/src/share/classes/com/sun/naming/internal/VersionHelper12.java 2013-09-06 11:28:00.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/naming/internal/VersionHelper12.java 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/naming/internal/VersionHelper12.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2006, Oracle and/or its affiliates. All rights reserved. @@ -56274,7 +57368,7 @@ * Given an enumeration of URLs, an instance of this class represents * an enumeration of their InputStreams. Each operation on the URL --- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java 2013-09-06 11:28:00.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java 2014-07-15 23:24:37.000000000 -0700 @@ -358,7 +358,8 @@ } else if (!isVisible(xmlns)) { // There is a defn but the xmlns is not selected by the xpath. @@ -56286,7 +57380,7 @@ // output the xmlns def if needed. if (n != null) { --- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java 2013-09-06 11:28:00.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java 2014-07-15 23:24:37.000000000 -0700 @@ -302,7 +302,8 @@ } else if ( !isVisible(xmlns)) { //There is a definition but the xmlns is not selected by the xpath. @@ -56298,7 +57392,7 @@ //output the xmlns def if needed. if (n!=null) { --- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java 2013-09-06 11:28:00.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java 2014-07-15 23:24:37.000000000 -0700 @@ -300,7 +300,7 @@ if ((xmlns!=null) && (!isVisible(xmlns))) { //There is a definition but the xmlns is not selected by the xpath. @@ -56309,7 +57403,7 @@ if (E.getNamespaceURI() != null) { --- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java 2013-09-06 11:28:00.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java 2014-07-15 23:24:37.000000000 -0700 @@ -34,7 +34,6 @@ import java.util.Map; import java.util.Set; @@ -56576,7 +57670,7 @@ + } --- ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java 2013-09-06 11:28:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java 2013-12-01 11:14:38.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream.java 2014-07-15 23:24:37.000000000 -0700 @@ -44,6 +44,9 @@ } @@ -56621,7 +57715,7 @@ byte newBuf[] = new byte[newSize]; System.arraycopy(buf, 0, newBuf, 0, pos); --- ./jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2013-09-06 11:28:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. @@ -56672,7 +57766,7 @@ // get the attributes from the struct Object attribs[] = s.getAttributes(map); --- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties 2013-09-06 11:28:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_de.properties 2014-07-15 23:24:37.000000000 -0700 @@ -140,7 +140,7 @@ #WebRowSetXmlReader exception wrsxmlreader.invalidcp = Ende von RowSet wurde erreicht. Ung\u00FCltige Cursorposition @@ -56683,7 +57777,7 @@ #WebRowSetXmlWriter exceptions wrsxmlwriter.ioex = IOException: {0} --- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties 2013-09-06 11:28:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ja.properties 2014-07-15 23:24:37.000000000 -0700 @@ -51,8 +51,8 @@ cachedrowsetimpl.last = last: TYPE_FORWARD_ONLY cachedrowsetimpl.absolute = absolute: \u7121\u52B9\u306A\u30AB\u30FC\u30BD\u30EB\u4F4D\u7F6E @@ -56705,7 +57799,7 @@ jdbcrowsetimpl.matchcols = \u4E00\u81F4\u5217\u304C\u5217\u306E\u30BB\u30C3\u30C8\u3068\u540C\u3058\u3067\u306F\u3042\u308A\u307E\u305B\u3093 jdbcrowsetimpl.setmatchcols = \u4E00\u81F4\u5217\u3092\u53D6\u5F97\u3059\u308B\u524D\u306B\u8A2D\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044 --- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties 2013-09-06 11:28:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_ko.properties 2014-07-15 23:24:37.000000000 -0700 @@ -44,7 +44,7 @@ cachedrowsetimpl.dtypemismt = \uB370\uC774\uD130 \uC720\uD615\uC774 \uC77C\uCE58\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. cachedrowsetimpl.datefail = {1} \uC5F4\uC758 \uAC12({0})\uC5D0\uC11C getDate\uB97C \uC2E4\uD328\uD588\uC2B5\uB2C8\uB2E4. \uBCC0\uD658\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. @@ -56734,7 +57828,7 @@ xmlrch.badvalue = \uC798\uBABB\uB41C \uAC12: \uB110\uC77C \uC218 \uC5C6\uB294 \uC18D\uC131\uC785\uB2C8\uB2E4. xmlrch.badvalue1 = \uC798\uBABB\uB41C \uAC12: \uB110\uC77C \uC218 \uC5C6\uB294 \uBA54\uD0C0 \uB370\uC774\uD130\uC785\uB2C8\uB2E4. --- ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties 2013-09-06 11:28:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/rowset/RowSetResourceBundle_sv.properties 2014-07-15 23:24:37.000000000 -0700 @@ -29,11 +29,11 @@ cachedrowsetimpl.nullhash = Kan inte instansiera CachedRowSetImpl. Null-hashtabell skickades till konstruktor cachedrowsetimpl.invalidop = En ogiltig \u00E5tg\u00E4rd utf\u00F6rdes p\u00E5 infogad rad @@ -56769,7 +57863,7 @@ #FilteredRowSetImpl exceptions --- ./jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java 2013-09-06 11:28:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/rowset/internal/CachedRowSetWriter.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -56803,7 +57897,7 @@ // get the attributes from the struct Object attribs[] = s.getAttributes(map); --- ./jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java 2013-09-06 11:28:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -56821,7 +57915,7 @@ }catch(ClassNotFoundException ex) { throw new SAXException(MessageFormat.format(resBundle.handleGetObject("xmlrch.errmap").toString(), ex.getMessage())); --- ./jdk/src/share/classes/com/sun/script/util/InterfaceImplementor.java 2013-09-06 11:28:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/script/util/InterfaceImplementor.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/script/util/InterfaceImplementor.java 2014-07-15 23:24:37.000000000 -0700 @@ -28,6 +28,7 @@ import javax.script.*; import java.lang.reflect.*; @@ -56872,7 +57966,7 @@ + } } --- ./jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java 2013-09-06 11:28:02.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/security/auth/module/Krb5LoginModule.java 2014-07-15 23:24:37.000000000 -0700 @@ -875,8 +875,7 @@ char[] tmpPassword = ((PasswordCallback) callbacks[0]).getPassword(); @@ -56883,8 +57977,63 @@ } password = new char[tmpPassword.length]; System.arraycopy(tmpPassword, 0, +--- ./jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java 2013-09-06 11:28:03.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/security/sasl/CramMD5Base.java 2014-07-15 23:24:37.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2003, 2014, 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 +@@ -32,6 +32,7 @@ + import java.security.NoSuchAlgorithmException; + import java.security.MessageDigest; + ++import java.util.Arrays; + import java.util.logging.Logger; + + /** +@@ -159,7 +160,7 @@ + MessageDigest md5 = MessageDigest.getInstance("MD5"); + + /* digest the key if longer than 64 bytes */ +- if (key.length > 64) { ++ if (key.length > MD5_BLOCKSIZE) { + key = md5.digest(key); + } + +@@ -169,13 +170,9 @@ + int i; + + /* store key in pads */ +- for (i = 0; i < MD5_BLOCKSIZE; i++) { +- for ( ; i < key.length; i++) { +- ipad[i] = key[i]; +- opad[i] = key[i]; +- } +- ipad[i] = 0x00; +- opad[i] = 0x00; ++ for (i = 0; i < key.length; i++) { ++ ipad[i] = key[i]; ++ opad[i] = key[i]; + } + + /* XOR key with pads */ +@@ -207,6 +204,11 @@ + } + } + ++ Arrays.fill(ipad, (byte)0); ++ Arrays.fill(opad, (byte)0); ++ ipad = null; ++ opad = null; ++ + return (digestString.toString()); + } + --- ./jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java 2013-09-06 11:28:03.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/security/sasl/util/AbstractSaslImpl.java 2014-07-15 23:24:37.000000000 -0700 @@ -252,11 +252,12 @@ @@ -56926,7 +58075,7 @@ logger.logp(Level.WARNING, srcClass, srcMethod, "SASLIMPL09:Error generating trace output: {0}", e); --- ./jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties 2013-09-06 11:28:03.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/basic/resources/basic_ko.properties 2014-07-15 23:24:37.000000000 -0700 @@ -46,7 +46,7 @@ FileChooser.openButton.textAndMnemonic=\uC5F4\uAE30(&O) FileChooser.saveDialogTitle.textAndMnemonic=\uC800\uC7A5 @@ -56946,7 +58095,7 @@ FileChooser.directoryOpenButtonToolTip.textAndMnemonic=\uC120\uD0DD\uB41C \uB514\uB809\uD1A0\uB9AC \uC5F4\uAE30 --- ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties 2013-09-06 11:28:03.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_fr.properties 2014-07-15 23:24:37.000000000 -0700 @@ -25,8 +25,8 @@ FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier : FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau. @@ -56959,7 +58108,7 @@ FileChooser.newFolderAccessibleName=Nouveau dossier FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier --- ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties 2013-09-06 11:28:03.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/metal/resources/metal_sv.properties 2014-07-15 23:24:37.000000000 -0700 @@ -20,8 +20,8 @@ FileChooser.lookInLabel.textAndMnemonic=Leta &i: @@ -56972,7 +58121,7 @@ FileChooser.upFolderToolTip.textAndMnemonic=Upp en niv\u00E5 FileChooser.upFolderAccessibleName=Upp --- ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties 2013-09-06 11:28:03.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties 2014-07-15 23:24:37.000000000 -0700 @@ -25,8 +25,8 @@ FileChooser.filesOfTypeLabel.textAndMnemonic=&Type de fichier : FileChooser.upFolderToolTip.textAndMnemonic=Remonte d'un niveau. @@ -56985,7 +58134,7 @@ FileChooser.newFolderAccessibleName=Nouveau dossier FileChooser.newFolderActionLabel.textAndMnemonic=Nouveau dossier --- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java 2013-09-06 11:28:04.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java 2014-07-15 23:24:37.000000000 -0700 @@ -84,7 +84,7 @@ lastPackage = pkg; printClass(clazz); @@ -56996,7 +58145,7 @@ out.println("<br>"); } --- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java 2013-09-06 11:28:04.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java 2014-07-15 23:24:37.000000000 -0700 @@ -112,12 +112,12 @@ out.println("<h2>Instances</h2>"); @@ -57036,7 +58185,7 @@ out.println("References summary by type</a>"); --- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java 2013-09-06 11:28:04.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java 2014-07-15 23:24:37.000000000 -0700 @@ -41,21 +41,17 @@ @@ -57079,7 +58228,7 @@ } --- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java 2013-09-06 11:28:04.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java 2014-07-15 23:24:37.000000000 -0700 @@ -102,7 +102,7 @@ int count = clazz.getInstancesCount(false); print("" + count); @@ -57099,7 +58248,7 @@ print("" + newInst + " new"); out.print("</a>) "); --- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java 2013-09-06 11:28:04.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java 2014-07-15 23:24:37.000000000 -0700 @@ -54,10 +54,7 @@ out.print((char)ch); } @@ -57113,7 +58262,7 @@ } } --- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java 2013-09-06 11:28:04.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java 2014-07-15 23:24:37.000000000 -0700 @@ -32,10 +32,7 @@ package com.sun.tools.hat.internal.server; @@ -57159,7 +58308,7 @@ } --- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java 2013-09-06 11:28:04.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java 2014-07-15 23:24:37.000000000 -0700 @@ -36,6 +36,7 @@ import com.sun.tools.hat.internal.model.*; @@ -57211,7 +58360,7 @@ + } } --- ./jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java 2013-09-06 11:28:04.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java 2014-07-15 23:24:37.000000000 -0700 @@ -89,7 +89,7 @@ out.println("<p align='center'>"); printClass(clazz); @@ -57234,7 +58383,7 @@ out.println("</td><td>"); out.println(map.get(clazz)); --- ./jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties 2013-09-06 11:28:05.000000000 -0700 -+++ ./jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/com/sun/tools/jdi/resources/jdi_ja.properties 2014-07-15 23:24:37.000000000 -0700 @@ -47,6 +47,6 @@ memory_listening.name = VM\u3078\u306E\u63A5\u7D9A\u3092\u30EA\u30B9\u30CB\u30F3\u30B0\u3059\u308B\u305F\u3081\u306E\u5171\u6709\u30E1\u30E2\u30EA\u30FC\u9818\u57DF\u540D memory_listening.name.label = \u540D\u524D @@ -57245,7 +58394,7 @@ -process_attaching.pid.label = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9ID(pid) +process_attaching.pid.label = \u30C7\u30D0\u30C3\u30B0\u3059\u308B\u30D7\u30ED\u30BB\u30B9ID (pid) --- ./jdk/src/share/classes/java/awt/AWTException.java 2013-09-06 11:28:05.000000000 -0700 -+++ ./jdk/src/share/classes/java/awt/AWTException.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/awt/AWTException.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 1997, Oracle and/or its affiliates. All rights reserved. @@ -57263,7 +58412,7 @@ * @author Arthur van Hoff */ --- ./jdk/src/share/classes/java/awt/Component.java 2013-09-06 11:28:05.000000000 -0700 -+++ ./jdk/src/share/classes/java/awt/Component.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/awt/Component.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. @@ -57296,8 +58445,17 @@ synchronized (getTreeLock()) { invalidate(); +@@ -7911,7 +7922,7 @@ + res = toFocus.requestFocusInWindow(CausedFocusEvent.Cause.TRAVERSAL_BACKWARD); + } + } +- if (!res) { ++ if (clearOnFailure && !res) { + if (focusLog.isLoggable(PlatformLogger.FINER)) { + focusLog.finer("clear global focus owner"); + } --- ./jdk/src/share/classes/java/awt/EventQueue.java 2013-09-06 11:28:05.000000000 -0700 -+++ ./jdk/src/share/classes/java/awt/EventQueue.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/classes/java/awt/EventQueue.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. @@ -57329,8 +58487,186 @@ if (prev == null) { queues[i].head = entry.next; } else { +--- ./jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2013-09-06 11:28:06.000000000 -0700 ++++ ./jdk/src/share/classes/java/awt/KeyboardFocusManager.java 2014-07-15 23:24:36.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2000, 2014, 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 +@@ -248,15 +248,7 @@ + public static void setCurrentKeyboardFocusManager( + KeyboardFocusManager newManager) throws SecurityException + { +- SecurityManager security = System.getSecurityManager(); +- if (security != null) { +- if (replaceKeyboardFocusManagerPermission == null) { +- replaceKeyboardFocusManagerPermission = +- new AWTPermission("replaceKeyboardFocusManager"); +- } +- security. +- checkPermission(replaceKeyboardFocusManagerPermission); +- } ++ checkReplaceKFMPermission(); + + KeyboardFocusManager oldManager = null; + +@@ -508,7 +500,7 @@ + */ + protected Component getGlobalFocusOwner() throws SecurityException { + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + return focusOwner; + } + } +@@ -543,7 +535,7 @@ + + if (focusOwner == null || focusOwner.isFocusable()) { + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + + oldFocusOwner = getFocusOwner(); + +@@ -595,7 +587,7 @@ + */ + public void clearGlobalFocusOwner() { + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + } + if (!GraphicsEnvironment.isHeadless()) { + // Toolkit must be fully initialized, otherwise +@@ -676,7 +668,7 @@ + throws SecurityException + { + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + return permanentFocusOwner; + } + } +@@ -712,7 +704,7 @@ + + if (permanentFocusOwner == null || permanentFocusOwner.isFocusable()) { + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + + oldPermanentFocusOwner = getPermanentFocusOwner(); + +@@ -779,7 +771,7 @@ + */ + protected Window getGlobalFocusedWindow() throws SecurityException { + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + return focusedWindow; + } + } +@@ -811,7 +803,7 @@ + + if (focusedWindow == null || focusedWindow.isFocusableWindow()) { + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + + oldFocusedWindow = getFocusedWindow(); + +@@ -879,7 +871,7 @@ + */ + protected Window getGlobalActiveWindow() throws SecurityException { + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + return activeWindow; + } + } +@@ -909,7 +901,7 @@ + protected void setGlobalActiveWindow(Window activeWindow) { + Window oldActiveWindow; + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + + oldActiveWindow = getActiveWindow(); + if (focusLog.isLoggable(PlatformLogger.FINER)) { +@@ -1205,7 +1197,7 @@ + throws SecurityException + { + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + return currentFocusCycleRoot; + } + } +@@ -1230,7 +1222,7 @@ + Container oldFocusCycleRoot; + + synchronized (KeyboardFocusManager.class) { +- checkCurrentKFMSecurity(); ++ checkKFMSecurity(); + + oldFocusCycleRoot = getCurrentFocusCycleRoot(); + currentFocusCycleRoot = newFocusCycleRoot; +@@ -2368,7 +2360,8 @@ + focusLog.finest("Request {0}", String.valueOf(hwFocusRequest)); + } + if (hwFocusRequest == null && +- heavyweight == nativeFocusOwner) ++ heavyweight == nativeFocusOwner && ++ heavyweight.getContainingWindow() == nativeFocusedWindow) + { + if (descendant == currentFocusOwner) { + // Redundant request. +@@ -3050,13 +3043,36 @@ + } + } + +- private void checkCurrentKFMSecurity() { +- if (this != getCurrentKeyboardFocusManager()) { +- if (focusLog.isLoggable(PlatformLogger.FINER)) { +- focusLog.finer("This manager is " + this + +- ", current is " + getCurrentKeyboardFocusManager()); ++ private static void checkReplaceKFMPermission() ++ throws SecurityException ++ { ++ SecurityManager security = System.getSecurityManager(); ++ if (security != null) { ++ if (replaceKeyboardFocusManagerPermission == null) { ++ replaceKeyboardFocusManagerPermission = ++ new AWTPermission("replaceKeyboardFocusManager"); + } +- throw new SecurityException(notPrivileged); ++ security. ++ checkPermission(replaceKeyboardFocusManagerPermission); ++ } ++ } ++ ++ // Checks if this KeyboardFocusManager instance is the current KFM, ++ // or otherwise checks if the calling thread has "replaceKeyboardFocusManager" ++ // permission. Here's the reasoning to do so: ++ // ++ // A system KFM instance (which is the current KFM by default) may have no ++ // "replaceKFM" permission when a client code is on the call stack beneath, ++ // but still it should be able to execute the methods protected by this check ++ // due to the system KFM is trusted (and so it does like "privileged"). ++ // ++ // If this KFM instance is not the current KFM but the client code has all ++ // permissions we can't throw SecurityException because it would contradict ++ // the security concepts. In this case the trusted client code is responsible ++ // for calling the secured methods from KFM instance which is not current. ++ private void checkKFMSecurity() { ++ if (this != getCurrentKeyboardFocusManager()) { ++ checkReplaceKFMPermission(); + } + } + } --- ./jdk/src/share/classes/java/awt/Toolkit.java 2013-09-06 11:28:06.000000000 -0700 -+++ ./jdk/src/share/classes/java/awt/Toolkit.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/awt/Toolkit.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved. @@ -57398,7 +58734,7 @@ pcs.firePropertyChange(evt); } --- ./jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java 2013-09-06 11:28:06.000000000 -0700 -+++ ./jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/java/awt/datatransfer/DataFlavor.java 2014-07-15 23:24:36.000000000 -0700 @@ -25,12 +25,14 @@ package java.awt.datatransfer; @@ -57468,7 +58804,7 @@ /* --- ./jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java 2013-09-06 11:28:06.000000000 -0700 -+++ ./jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/classes/java/awt/datatransfer/SystemFlavorMap.java 2014-07-15 23:24:36.000000000 -0700 @@ -45,8 +45,8 @@ import java.util.List; import java.util.Map; @@ -57571,7 +58907,7 @@ try { parseAndStoreReader(flavormapURL); --- ./jdk/src/share/classes/java/awt/event/InvocationEvent.java 2013-09-06 11:28:07.000000000 -0700 -+++ ./jdk/src/share/classes/java/awt/event/InvocationEvent.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/java/awt/event/InvocationEvent.java 2014-07-15 23:24:36.000000000 -0700 @@ -25,6 +25,8 @@ package java.awt.event; @@ -57729,7 +59065,7 @@ * This method is useful for event-logging and for debugging. * --- ./jdk/src/share/classes/java/beans/Beans.java 2013-09-06 11:28:08.000000000 -0700 -+++ ./jdk/src/share/classes/java/beans/Beans.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/java/beans/Beans.java 2014-07-15 23:24:36.000000000 -0700 @@ -42,6 +42,8 @@ import java.io.ObjectStreamClass; import java.io.StreamCorruptedException; @@ -57751,7 +59087,7 @@ * Try to instantiate the class. */ --- ./jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java 2013-09-06 11:28:08.000000000 -0700 -+++ ./jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/java/beans/DefaultPersistenceDelegate.java 2014-07-15 23:24:36.000000000 -0700 @@ -220,6 +220,9 @@ // Write out the properties of this instance. private void initBean(Class type, Object oldInstance, Object newInstance, Encoder out) { @@ -57763,7 +59099,7 @@ if (Modifier.isFinal(mod) || Modifier.isStatic(mod) || Modifier.isTransient(mod)) { continue; --- ./jdk/src/share/classes/java/beans/MetaData.java 2013-09-06 11:28:08.000000000 -0700 -+++ ./jdk/src/share/classes/java/beans/MetaData.java 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/classes/java/beans/MetaData.java 2014-07-15 23:24:36.000000000 -0700 @@ -42,6 +42,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -57805,7 +59141,7 @@ } } --- ./jdk/src/share/classes/java/beans/ThreadGroupContext.java 2013-09-06 11:28:08.000000000 -0700 -+++ ./jdk/src/share/classes/java/beans/ThreadGroupContext.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/java/beans/ThreadGroupContext.java 2014-07-15 23:24:36.000000000 -0700 @@ -41,24 +41,20 @@ */ final class ThreadGroupContext { @@ -57839,7 +59175,7 @@ private volatile boolean isDesignTime; --- ./jdk/src/share/classes/java/beans/WeakIdentityMap.java 2013-09-06 11:28:08.000000000 -0700 -+++ ./jdk/src/share/classes/java/beans/WeakIdentityMap.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/java/beans/WeakIdentityMap.java 2014-07-15 23:24:36.000000000 -0700 @@ -33,18 +33,22 @@ * and reference-equality in place of object-equality to compare them. * An entry will automatically be removed when its key is no longer @@ -58018,7 +59354,7 @@ Entry(Object key, int hash, T value, ReferenceQueue<Object> queue, Entry<T> next) { super(key, queue); --- ./jdk/src/share/classes/java/io/File.java 2013-09-06 11:28:09.000000000 -0700 -+++ ./jdk/src/share/classes/java/io/File.java 2013-12-01 11:14:28.000000000 -0800 ++++ ./jdk/src/share/classes/java/io/File.java 2014-07-15 23:24:36.000000000 -0700 @@ -1885,10 +1885,18 @@ } else { n = Math.abs(n); @@ -58041,7 +59377,7 @@ } } --- ./jdk/src/share/classes/java/io/ObjectInputStream.java 2013-09-06 11:28:09.000000000 -0700 -+++ ./jdk/src/share/classes/java/io/ObjectInputStream.java 2013-12-01 11:14:28.000000000 -0800 ++++ ./jdk/src/share/classes/java/io/ObjectInputStream.java 2014-07-15 23:24:36.000000000 -0700 @@ -490,11 +490,12 @@ public void defaultReadObject() throws IOException, ClassNotFoundException @@ -58083,7 +59419,7 @@ if (cl != null && obj != null && !cl.isInstance(obj)) { throw new ClassCastException(); --- ./jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-09-06 11:28:09.000000000 -0700 -+++ ./jdk/src/share/classes/java/io/ObjectOutputStream.java 2013-12-01 11:14:28.000000000 -0800 ++++ ./jdk/src/share/classes/java/io/ObjectOutputStream.java 2014-07-15 23:24:36.000000000 -0700 @@ -430,11 +430,12 @@ * <code>OutputStream</code> */ @@ -58130,7 +59466,7 @@ int primDataSize = desc.getPrimDataSize(); --- ./jdk/src/share/classes/java/lang/AbstractStringBuilder.java 2013-09-06 11:28:09.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/AbstractStringBuilder.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/AbstractStringBuilder.java 2014-07-15 23:24:36.000000000 -0700 @@ -1273,7 +1273,7 @@ * specified substring, starting at the specified index. The integer * returned is the smallest value <tt>k</tt> for which: @@ -58150,7 +59486,7 @@ * </pre></blockquote> * If no such value of <i>k</i> exists, then -1 is returned. --- ./jdk/src/share/classes/java/lang/Class.java 2013-09-06 11:28:09.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/Class.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/Class.java 2014-07-15 23:24:36.000000000 -0700 @@ -1096,7 +1096,17 @@ * @return the declaring class for this class * @since JDK1.1 @@ -58230,7 +59566,7 @@ /* * Check if client is allowed to access members. If access is denied, --- ./jdk/src/share/classes/java/lang/ClassLoader.java 2013-09-06 11:28:09.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/ClassLoader.java 2013-12-01 11:14:28.000000000 -0800 ++++ ./jdk/src/share/classes/java/lang/ClassLoader.java 2014-07-15 23:24:36.000000000 -0700 @@ -58,6 +58,7 @@ import sun.misc.VM; import sun.reflect.CallerSensitive; @@ -58254,7 +59590,7 @@ final int i = name.lastIndexOf('.'); if (i != -1) { --- ./jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java 2013-09-06 11:28:09.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/ConditionalSpecialCasing.java 2014-07-15 23:24:36.000000000 -0700 @@ -74,7 +74,6 @@ new Entry(0x00CC, new char[]{0x0069, 0x0307, 0x0300}, new char[]{0x00CC}, "lt", 0), // # LATIN CAPITAL LETTER I WITH GRAVE new Entry(0x00CD, new char[]{0x0069, 0x0307, 0x0301}, new char[]{0x00CD}, "lt", 0), // # LATIN CAPITAL LETTER I WITH ACUTE @@ -58275,8 +59611,23 @@ }; // A hash table that contains the above entries +--- ./jdk/src/share/classes/java/lang/ProcessBuilder.java 2013-09-06 11:28:10.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-07-15 23:24:36.000000000 -0700 +@@ -1018,6 +1018,12 @@ + + String dir = directory == null ? null : directory.toString(); + ++ for (int i = 1; i < cmdarray.length; i++) { ++ if (cmdarray[i].indexOf('\u0000') >= 0) { ++ throw new IOException("invalid null character in command"); ++ } ++ } ++ + try { + return ProcessImpl.start(cmdarray, + environment, --- ./jdk/src/share/classes/java/lang/SecurityManager.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/SecurityManager.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/java/lang/SecurityManager.java 2014-07-15 23:24:36.000000000 -0700 @@ -1131,12 +1131,8 @@ * @see #checkPermission(java.security.Permission) checkPermission */ @@ -58293,7 +59644,7 @@ /** --- ./jdk/src/share/classes/java/lang/String.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/String.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/String.java 2014-07-15 23:24:36.000000000 -0700 @@ -2461,21 +2461,14 @@ } if (localeDependent || srcChar == '\u03A3') { // GREEK CAPITAL LETTER SIGMA @@ -58319,7 +59670,7 @@ resultOffset += Character.toChars(lowerChar, result, i + resultOffset) - srcCount; continue; --- ./jdk/src/share/classes/java/lang/System.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/System.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/System.java 2014-07-15 23:24:36.000000000 -0700 @@ -25,6 +25,7 @@ package java.lang; @@ -58342,7 +59693,7 @@ } } --- ./jdk/src/share/classes/java/lang/Thread.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/Thread.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/Thread.java 2014-07-15 23:24:36.000000000 -0700 @@ -341,6 +341,15 @@ } @@ -58409,7 +59760,7 @@ * effect as {@linkplain #Thread(ThreadGroup,Runnable,String) Thread} * {@code (group, target, gname)} ,where {@code gname} is a newly generated --- ./jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-07-15 23:24:36.000000000 -0700 @@ -140,7 +140,7 @@ * Return the {@link SpeciesData} instance representing this BMH species. All subclasses must provide a * static field containing this value, and they must accordingly implement this method. @@ -58634,7 +59985,7 @@ mv.visitLdcInsn(types); mv.visitLdcInsn(Type.getObjectType(className)); --- ./jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2014-07-15 23:24:36.000000000 -0700 @@ -53,7 +53,8 @@ if (!member.isResolved()) throw new InternalError(); @@ -58645,8 +59996,155 @@ // Check for corner case: invokeinterface of Object method MemberName m = new MemberName(Object.class, member.getName(), member.getMethodType(), member.getReferenceKind()); m = MemberName.getFactory().resolveOrNull(m.getReferenceKind(), m, null); +@@ -242,12 +243,12 @@ + assert(names.length == nameCursor); + if (doesAlloc) { + // names = { argx,y,z,... new C, init method } +- names[NEW_OBJ] = new Name(NF_allocateInstance, names[DMH_THIS]); +- names[GET_MEMBER] = new Name(NF_constructorMethod, names[DMH_THIS]); ++ names[NEW_OBJ] = new Name(Lazy.NF_allocateInstance, names[DMH_THIS]); ++ names[GET_MEMBER] = new Name(Lazy.NF_constructorMethod, names[DMH_THIS]); + } else if (needsInit) { +- names[GET_MEMBER] = new Name(NF_internalMemberNameEnsureInit, names[DMH_THIS]); ++ names[GET_MEMBER] = new Name(Lazy.NF_internalMemberNameEnsureInit, names[DMH_THIS]); + } else { +- names[GET_MEMBER] = new Name(NF_internalMemberName, names[DMH_THIS]); ++ names[GET_MEMBER] = new Name(Lazy.NF_internalMemberName, names[DMH_THIS]); + } + Object[] outArgs = Arrays.copyOfRange(names, ARG_BASE, GET_MEMBER+1, Object[].class); + assert(outArgs[outArgs.length-1] == names[GET_MEMBER]); // look, shifted args! +@@ -595,18 +596,18 @@ + final int RESULT = nameCursor-1; // either the call or the cast + Name[] names = arguments(nameCursor - ARG_LIMIT, mtype.invokerType()); + if (needsInit) +- names[INIT_BAR] = new Name(NF_ensureInitialized, names[DMH_THIS]); ++ names[INIT_BAR] = new Name(Lazy.NF_ensureInitialized, names[DMH_THIS]); + if (needsCast && !isGetter) +- names[PRE_CAST] = new Name(NF_checkCast, names[DMH_THIS], names[SET_VALUE]); ++ names[PRE_CAST] = new Name(Lazy.NF_checkCast, names[DMH_THIS], names[SET_VALUE]); + Object[] outArgs = new Object[1 + linkerType.parameterCount()]; + assert(outArgs.length == (isGetter ? 3 : 4)); + outArgs[0] = UNSAFE; + if (isStatic) { +- outArgs[1] = names[F_HOLDER] = new Name(NF_staticBase, names[DMH_THIS]); +- outArgs[2] = names[F_OFFSET] = new Name(NF_staticOffset, names[DMH_THIS]); ++ outArgs[1] = names[F_HOLDER] = new Name(Lazy.NF_staticBase, names[DMH_THIS]); ++ outArgs[2] = names[F_OFFSET] = new Name(Lazy.NF_staticOffset, names[DMH_THIS]); + } else { +- outArgs[1] = names[OBJ_CHECK] = new Name(NF_checkBase, names[OBJ_BASE]); +- outArgs[2] = names[F_OFFSET] = new Name(NF_fieldOffset, names[DMH_THIS]); ++ outArgs[1] = names[OBJ_CHECK] = new Name(Lazy.NF_checkBase, names[OBJ_BASE]); ++ outArgs[2] = names[F_OFFSET] = new Name(Lazy.NF_fieldOffset, names[DMH_THIS]); + } + if (!isGetter) { + outArgs[3] = (needsCast ? names[PRE_CAST] : names[SET_VALUE]); +@@ -614,7 +615,7 @@ + for (Object a : outArgs) assert(a != null); + names[LINKER_CALL] = new Name(linker, outArgs); + if (needsCast && isGetter) +- names[POST_CAST] = new Name(NF_checkCast, names[DMH_THIS], names[LINKER_CALL]); ++ names[POST_CAST] = new Name(Lazy.NF_checkCast, names[DMH_THIS], names[LINKER_CALL]); + for (Name n : names) assert(n != null); + String fieldOrStatic = (isStatic ? "Static" : "Field"); + String lambdaName = (linkerName + fieldOrStatic); // significant only for debugging +@@ -623,48 +624,54 @@ + return new LambdaForm(lambdaName, ARG_LIMIT, names, RESULT); + } + +- private static final NamedFunction +- NF_internalMemberName, +- NF_internalMemberNameEnsureInit, +- NF_ensureInitialized, +- NF_fieldOffset, +- NF_checkBase, +- NF_staticBase, +- NF_staticOffset, +- NF_checkCast, +- NF_allocateInstance, +- NF_constructorMethod; +- static { +- try { +- NamedFunction nfs[] = { +- NF_internalMemberName = new NamedFunction(DirectMethodHandle.class +- .getDeclaredMethod("internalMemberName", Object.class)), +- NF_internalMemberNameEnsureInit = new NamedFunction(DirectMethodHandle.class +- .getDeclaredMethod("internalMemberNameEnsureInit", Object.class)), +- NF_ensureInitialized = new NamedFunction(DirectMethodHandle.class +- .getDeclaredMethod("ensureInitialized", Object.class)), +- NF_fieldOffset = new NamedFunction(DirectMethodHandle.class +- .getDeclaredMethod("fieldOffset", Object.class)), +- NF_checkBase = new NamedFunction(DirectMethodHandle.class +- .getDeclaredMethod("checkBase", Object.class)), +- NF_staticBase = new NamedFunction(DirectMethodHandle.class +- .getDeclaredMethod("staticBase", Object.class)), +- NF_staticOffset = new NamedFunction(DirectMethodHandle.class +- .getDeclaredMethod("staticOffset", Object.class)), +- NF_checkCast = new NamedFunction(DirectMethodHandle.class +- .getDeclaredMethod("checkCast", Object.class, Object.class)), +- NF_allocateInstance = new NamedFunction(DirectMethodHandle.class +- .getDeclaredMethod("allocateInstance", Object.class)), +- NF_constructorMethod = new NamedFunction(DirectMethodHandle.class +- .getDeclaredMethod("constructorMethod", Object.class)) +- }; +- for (NamedFunction nf : nfs) { +- // Each nf must be statically invocable or we get tied up in our bootstraps. +- assert(InvokerBytecodeGenerator.isStaticallyInvocable(nf.member)) : nf; +- nf.resolve(); ++ /** ++ * Pre-initialized NamedFunctions for bootstrapping purposes. ++ * Factored in an inner class to delay initialization until first usage. ++ */ ++ private static class Lazy { ++ static final NamedFunction ++ NF_internalMemberName, ++ NF_internalMemberNameEnsureInit, ++ NF_ensureInitialized, ++ NF_fieldOffset, ++ NF_checkBase, ++ NF_staticBase, ++ NF_staticOffset, ++ NF_checkCast, ++ NF_allocateInstance, ++ NF_constructorMethod; ++ static { ++ try { ++ NamedFunction nfs[] = { ++ NF_internalMemberName = new NamedFunction(DirectMethodHandle.class ++ .getDeclaredMethod("internalMemberName", Object.class)), ++ NF_internalMemberNameEnsureInit = new NamedFunction(DirectMethodHandle.class ++ .getDeclaredMethod("internalMemberNameEnsureInit", Object.class)), ++ NF_ensureInitialized = new NamedFunction(DirectMethodHandle.class ++ .getDeclaredMethod("ensureInitialized", Object.class)), ++ NF_fieldOffset = new NamedFunction(DirectMethodHandle.class ++ .getDeclaredMethod("fieldOffset", Object.class)), ++ NF_checkBase = new NamedFunction(DirectMethodHandle.class ++ .getDeclaredMethod("checkBase", Object.class)), ++ NF_staticBase = new NamedFunction(DirectMethodHandle.class ++ .getDeclaredMethod("staticBase", Object.class)), ++ NF_staticOffset = new NamedFunction(DirectMethodHandle.class ++ .getDeclaredMethod("staticOffset", Object.class)), ++ NF_checkCast = new NamedFunction(DirectMethodHandle.class ++ .getDeclaredMethod("checkCast", Object.class, Object.class)), ++ NF_allocateInstance = new NamedFunction(DirectMethodHandle.class ++ .getDeclaredMethod("allocateInstance", Object.class)), ++ NF_constructorMethod = new NamedFunction(DirectMethodHandle.class ++ .getDeclaredMethod("constructorMethod", Object.class)) ++ }; ++ for (NamedFunction nf : nfs) { ++ // Each nf must be statically invocable or we get tied up in our bootstraps. ++ assert(InvokerBytecodeGenerator.isStaticallyInvocable(nf.member)) : nf; ++ nf.resolve(); ++ } ++ } catch (ReflectiveOperationException ex) { ++ throw newInternalError(ex); + } +- } catch (ReflectiveOperationException ex) { +- throw newInternalError(ex); + } + } + } --- ./jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-07-15 23:24:36.000000000 -0700 @@ -289,8 +289,9 @@ * Set up class file generation. */ @@ -58658,9 +60156,117 @@ cw.visitSource(sourceFile, null); String invokerDesc = invokerType.toMethodDescriptorString(); +@@ -612,6 +613,12 @@ + return false; // inner class of some sort + if (cls.getClassLoader() != MethodHandle.class.getClassLoader()) + return false; // not on BCP ++ MethodType mtype = member.getMethodOrFieldType(); ++ if (!isStaticallyNameable(mtype.returnType())) ++ return false; ++ for (Class<?> ptype : mtype.parameterArray()) ++ if (!isStaticallyNameable(ptype)) ++ return false; + if (!member.isPrivate() && VerifyAccess.isSamePackage(MethodHandle.class, cls)) + return true; // in java.lang.invoke package + if (member.isPublic() && isStaticallyNameable(cls)) +--- ./jdk/src/share/classes/java/lang/invoke/Invokers.java 2013-09-06 11:28:10.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/invoke/Invokers.java 2014-07-15 23:24:36.000000000 -0700 +@@ -318,6 +318,7 @@ + // let mt=TYPEOF(a*:R), tmh=asType(mh, mt); + // tmh.invokeBasic(a*) + outArgs = Arrays.copyOfRange(names, CALL_MH, OUTARG_LIMIT, Object[].class); ++ outArgs[0] = names[CHECK_TYPE]; + outCallType = mtype; + } else { + names[CHECK_TYPE] = new Name(NF_checkGenericType, names[CALL_MH], mtypeArg); +--- ./jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2013-09-06 11:28:10.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2014-07-15 23:24:36.000000000 -0700 +@@ -753,6 +753,10 @@ + * to the target method handle. + * (The array may also be null when zero elements are required.) + * <p> ++ * If, when the adapter is called, the supplied array argument does ++ * not have the correct number of elements, the adapter will throw ++ * an {@link IllegalArgumentException} instead of invoking the target. ++ * <p> + * Here are some simple examples of array-spreading method handles: + * <blockquote><pre> + MethodHandle equals = publicLookup() +@@ -763,6 +767,12 @@ + MethodHandle eq2 = equals.asSpreader(Object[].class, 2); + assert( (boolean) eq2.invokeExact(new Object[]{ "me", "me" })); + assert(!(boolean) eq2.invokeExact(new Object[]{ "me", "thee" })); ++// try to spread from anything but a 2-array: ++for (int n = 0; n <= 10; n++) { ++ Object[] badArityArgs = (n == 2 ? null : new Object[n]); ++ try { assert((boolean) eq2.invokeExact(badArityArgs) && false); } ++ catch (IllegalArgumentException ex) { } // OK ++} + // spread both arguments from a String array: + MethodHandle eq2s = equals.asSpreader(String[].class, 2); + assert( (boolean) eq2s.invokeExact(new String[]{ "me", "me" })); --- ./jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-06-06 19:56:29.000000000 -0700 -@@ -742,7 +742,8 @@ ++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-07-15 23:24:36.000000000 -0700 +@@ -430,7 +430,7 @@ + // Spread the array. + MethodHandle aload = MethodHandles.arrayElementGetter(spreadArgType); + Name array = names[argIndex]; +- names[nameCursor++] = new Name(NF_checkSpreadArgument, array, spreadArgCount); ++ names[nameCursor++] = new Name(Lazy.NF_checkSpreadArgument, array, spreadArgCount); + for (int j = 0; j < spreadArgCount; i++, j++) { + indexes[i] = nameCursor; + names[nameCursor++] = new Name(aload, array, j); +@@ -454,14 +454,8 @@ + } + + static void checkSpreadArgument(Object av, int n) { +- // FIXME: regression test for bug 7141637 erroneously expects an NPE, and other tests may expect IAE +- // but the actual exception raised by an arity mismatch should be WMTE +- final boolean RAISE_RANDOM_EXCEPTIONS = true; // FIXME: delete in JSR 292 M1 + if (av == null) { + if (n == 0) return; +- int len; +- if (RAISE_RANDOM_EXCEPTIONS) +- len = ((Object[])av).length; // throw NPE; but delete this after tests are fixed + } else if (av instanceof Object[]) { + int len = ((Object[])av).length; + if (len == n) return; +@@ -470,19 +464,23 @@ + if (len == n) return; + } + // fall through to error: +- if (RAISE_RANDOM_EXCEPTIONS) +- throw newIllegalArgumentException("Array is not of length "+n); +- throw new WrongMethodTypeException("Array is not of length "+n); ++ throw newIllegalArgumentException("array is not of length "+n); + } + +- private static final NamedFunction NF_checkSpreadArgument; +- static { +- try { +- NF_checkSpreadArgument = new NamedFunction(MethodHandleImpl.class +- .getDeclaredMethod("checkSpreadArgument", Object.class, int.class)); +- NF_checkSpreadArgument.resolve(); +- } catch (ReflectiveOperationException ex) { +- throw newInternalError(ex); ++ /** ++ * Pre-initialized NamedFunctions for bootstrapping purposes. ++ * Factored in an inner class to delay initialization until first usage. ++ */ ++ private static class Lazy { ++ static final NamedFunction NF_checkSpreadArgument; ++ static { ++ try { ++ NF_checkSpreadArgument = new NamedFunction(MethodHandleImpl.class ++ .getDeclaredMethod("checkSpreadArgument", Object.class, int.class)); ++ NF_checkSpreadArgument.resolve(); ++ } catch (ReflectiveOperationException ex) { ++ throw newInternalError(ex); ++ } + } + } + +@@ -742,7 +740,8 @@ GuardWithCatch gguard = new GuardWithCatch(gtarget, exType, gcatcher); if (gtarget == null || gcatcher == null) throw new InternalError(); MethodHandle ginvoker = GuardWithCatch.VARARGS_INVOKE.bindReceiver(gguard); @@ -58671,7 +60277,7 @@ } --- ./jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-12-01 11:14:28.000000000 -0800 ++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2014-07-15 23:24:36.000000000 -0700 @@ -456,6 +456,7 @@ case "getDeclaredField": case "getDeclaredMethod": @@ -58689,8 +60295,47 @@ case "newProxyInstance": return defc == java.lang.reflect.Proxy.class; --- ./jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2014-04-19 01:27:13.000000000 -0700 -@@ -426,7 +426,7 @@ ++++ ./jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2014-07-15 23:24:36.000000000 -0700 +@@ -26,12 +26,15 @@ + package java.lang.invoke; + + import java.lang.reflect.*; ++ + import sun.invoke.util.ValueConversions; + import sun.invoke.util.VerifyAccess; + import sun.invoke.util.Wrapper; ++ + import java.util.List; + import java.util.ArrayList; + import java.util.Arrays; ++ + import sun.reflect.CallerSensitive; + import sun.reflect.Reflection; + import sun.reflect.misc.ReflectUtil; +@@ -245,6 +248,9 @@ + * In general, the conditions under which a method handle may be + * looked up for a method {@code M} are exactly equivalent to the conditions + * under which the lookup class could have compiled and resolved a call to {@code M}. ++ * Where the JVM would raise exceptions like {@code NoSuchMethodError}, ++ * a method handle lookup will generally raise a corresponding ++ * checked exception, such as {@code NoSuchMethodException}. + * And the effect of invoking the method handle resulting from the lookup + * is exactly equivalent to executing the compiled and resolved call to {@code M}. + * The same point is true of fields and constructors. +@@ -261,6 +267,12 @@ + * (which will necessarily be a superclass of the lookup class) + * to the lookup class itself. + * <p> ++ * The JVM represents constructors and static initializer blocks as internal methods ++ * with special names ({@code "<init>"} and {@code "<clinit>"}). ++ * The internal syntax of invocation instructions allows them to refer to such internal ++ * methods as if they were normal methods, but the JVM verifier rejects them. ++ * A lookup of such an internal method will produce a {@code NoSuchMethodException}. ++ * <p> + * In some cases, access between nested classes is obtained by the Java compiler by creating + * an wrapper method to access a private method of another class + * in the same top-level declaration. +@@ -426,7 +438,7 @@ Lookup(Class<?> lookupClass) { this(lookupClass, ALL_MODES); @@ -58699,7 +60344,7 @@ } private Lookup(Class<?> lookupClass, int allowedModes) { -@@ -480,7 +480,7 @@ +@@ -480,7 +492,7 @@ // No permissions. newModes = 0; } @@ -58708,7 +60353,7 @@ return new Lookup(requestedLookupClass, newModes); } -@@ -496,10 +496,19 @@ +@@ -496,10 +508,19 @@ /** Package-private version of lookup which is trusted. */ static final Lookup IMPL_LOOKUP = new Lookup(Object.class, TRUSTED); @@ -58729,7 +60374,180 @@ } /** -@@ -1316,6 +1325,10 @@ +@@ -566,6 +587,15 @@ + * The returned method handle will have + * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if + * the method's variable arity modifier bit ({@code 0x0080}) is set. ++ * <b>Example:</b> ++ * <p><blockquote><pre>{@code ++import static java.lang.invoke.MethodHandles.*; ++import static java.lang.invoke.MethodType.*; ++... ++MethodHandle MH_asList = publicLookup().findStatic(Arrays.class, ++ "asList", methodType(List.class, Object[].class)); ++assertEquals("[x, y]", MH_asList.invoke("x", "y").toString()); ++ * }</pre></blockquote> + * @param refc the class from which the method is accessed + * @param name the name of the method + * @param type the type of the method +@@ -616,6 +646,34 @@ + * {@link java.lang.invoke.MethodHandles#invoker MethodHandles.invoker} + * with the same {@code type} argument. + * ++ * <b>Example:</b> ++ * <p><blockquote><pre>{@code ++import static java.lang.invoke.MethodHandles.*; ++import static java.lang.invoke.MethodType.*; ++... ++MethodHandle MH_concat = publicLookup().findVirtual(String.class, ++ "concat", methodType(String.class, String.class)); ++MethodHandle MH_hashCode = publicLookup().findVirtual(Object.class, ++ "hashCode", methodType(int.class)); ++MethodHandle MH_hashCode_String = publicLookup().findVirtual(String.class, ++ "hashCode", methodType(int.class)); ++assertEquals("xy", (String) MH_concat.invokeExact("x", "y")); ++assertEquals("xy".hashCode(), (int) MH_hashCode.invokeExact((Object)"xy")); ++assertEquals("xy".hashCode(), (int) MH_hashCode_String.invokeExact("xy")); ++// interface method: ++MethodHandle MH_subSequence = publicLookup().findVirtual(CharSequence.class, ++ "subSequence", methodType(CharSequence.class, int.class, int.class)); ++assertEquals("def", MH_subSequence.invoke("abcdefghi", 3, 6).toString()); ++// constructor "internal method" must be accessed differently: ++MethodType MT_newString = methodType(void.class); //()V for new String() ++try { assertEquals("impossible", lookup() ++ .findVirtual(String.class, "<init>", MT_newString)); ++ } catch (NoSuchMethodException ex) { } // OK ++MethodHandle MH_newString = publicLookup() ++ .findConstructor(String.class, MT_newString); ++assertEquals("", (String) MH_newString.invokeExact()); ++ * }</pre></blockquote> ++ * + * @param refc the class or interface from which the method is accessed + * @param name the name of the method + * @param type the type of the method, with the receiver argument omitted +@@ -657,12 +715,30 @@ + * If the constructor's class has not yet been initialized, that is done + * immediately, before the method handle is returned. + * <p> +- * Note: The requested type must have a return type of {@code void}. +- * This is consistent with the JVM's treatment of constructor type descriptors. ++ * <em>(Note: The requested type must have a return type of {@code void}. ++ * This is consistent with the JVM's treatment of constructor type descriptors.)</em> + * <p> + * The returned method handle will have + * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if + * the constructor's variable arity modifier bit ({@code 0x0080}) is set. ++ * <b>Example:</b> ++ * <p><blockquote><pre>{@code ++import static java.lang.invoke.MethodHandles.*; ++import static java.lang.invoke.MethodType.*; ++... ++MethodHandle MH_newArrayList = publicLookup().findConstructor( ++ ArrayList.class, methodType(void.class, Collection.class)); ++Collection orig = Arrays.asList("x", "y"); ++Collection copy = (ArrayList) MH_newArrayList.invokeExact(orig); ++assert(orig != copy); ++assertEquals(orig, copy); ++// a variable-arity constructor: ++MethodHandle MH_newProcessBuilder = publicLookup().findConstructor( ++ ProcessBuilder.class, methodType(void.class, String[].class)); ++ProcessBuilder pb = (ProcessBuilder) ++ MH_newProcessBuilder.invoke("x", "y", "z"); ++assertEquals("[x, y, z]", pb.command().toString()); ++ * }</pre></blockquote> + * @param refc the class or interface from which the method is accessed + * @param type the type of the method, with the receiver argument omitted, and a void return type + * @return the desired method handle +@@ -702,6 +778,45 @@ + * The returned method handle will have + * {@linkplain MethodHandle#asVarargsCollector variable arity} if and only if + * the method's variable arity modifier bit ({@code 0x0080}) is set. ++ * <p> ++ * <em>(Note: JVM internal methods named {@code <init>} not visible to this API, ++ * even though the {@code invokespecial} instruction can refer to them ++ * in special circumstances. Use {@link #findConstructor findConstructor} ++ * to access instance initialization methods in a safe manner.)</em> ++ * <b>Example:</b> ++ * <p><blockquote><pre>{@code ++import static java.lang.invoke.MethodHandles.*; ++import static java.lang.invoke.MethodType.*; ++... ++static class Listie extends ArrayList { ++ public String toString() { return "[wee Listie]"; } ++ static Lookup lookup() { return MethodHandles.lookup(); } ++} ++... ++// no access to constructor via invokeSpecial: ++MethodHandle MH_newListie = Listie.lookup() ++ .findConstructor(Listie.class, methodType(void.class)); ++Listie l = (Listie) MH_newListie.invokeExact(); ++try { assertEquals("impossible", Listie.lookup().findSpecial( ++ Listie.class, "<init>", methodType(void.class), Listie.class)); ++ } catch (NoSuchMethodException ex) { } // OK ++// access to super and self methods via invokeSpecial: ++MethodHandle MH_super = Listie.lookup().findSpecial( ++ ArrayList.class, "toString" , methodType(String.class), Listie.class); ++MethodHandle MH_this = Listie.lookup().findSpecial( ++ Listie.class, "toString" , methodType(String.class), Listie.class); ++MethodHandle MH_duper = Listie.lookup().findSpecial( ++ Object.class, "toString" , methodType(String.class), Listie.class); ++assertEquals("[]", (String) MH_super.invokeExact(l)); ++assertEquals(""+l, (String) MH_this.invokeExact(l)); ++assertEquals("[]", (String) MH_duper.invokeExact(l)); // ArrayList method ++try { assertEquals("inaccessible", Listie.lookup().findSpecial( ++ String.class, "toString", methodType(String.class), Listie.class)); ++ } catch (IllegalAccessException ex) { } // OK ++Listie subl = new Listie() { public String toString() { return "[subclass]"; } }; ++assertEquals(""+l, (String) MH_this.invokeExact(subl)); // Listie method ++ * }</pre></blockquote> ++ * + * @param refc the class or interface from which the method is accessed + * @param name the name of the method (which must not be "<init>") + * @param type the type of the method, with the receiver argument omitted +@@ -1005,15 +1120,16 @@ + /// Helper methods, all package-private. + + MemberName resolveOrFail(byte refKind, Class<?> refc, String name, Class<?> type) throws NoSuchFieldException, IllegalAccessException { +- checkSymbolicClass(refc); // do this before attempting to resolve + name.getClass(); type.getClass(); // NPE ++ checkSymbolicClass(refc); // do this before attempting to resolve + return IMPL_NAMES.resolveOrFail(refKind, new MemberName(refc, name, type, refKind), lookupClassOrNull(), + NoSuchFieldException.class); + } + + MemberName resolveOrFail(byte refKind, Class<?> refc, String name, MethodType type) throws NoSuchMethodException, IllegalAccessException { ++ type.getClass(); // NPE + checkSymbolicClass(refc); // do this before attempting to resolve +- name.getClass(); type.getClass(); // NPE ++ checkMethodName(refKind, name); + return IMPL_NAMES.resolveOrFail(refKind, new MemberName(refc, name, type, refKind), lookupClassOrNull(), + NoSuchMethodException.class); + } +@@ -1024,6 +1140,12 @@ + throw new MemberName(refc).makeAccessException("symbolic reference class is not public", this); + } + ++ void checkMethodName(byte refKind, String name) throws NoSuchMethodException { ++ if (name.startsWith("<") && refKind != REF_newInvokeSpecial) ++ throw new NoSuchMethodException("illegal method name: "+name); ++ } ++ ++ + /** + * Find my trustable caller class if m is a caller sensitive method. + * If this lookup object has private access, then the caller class is the lookupClass. +@@ -1146,6 +1268,10 @@ + int allowedModes = this.allowedModes; + if (allowedModes == TRUSTED) return; + int mods = m.getModifiers(); ++ if (Modifier.isProtected(mods) && refKind == REF_newInvokeSpecial) { ++ // cannot "new" a protected ctor in a different package ++ mods ^= Modifier.PROTECTED; ++ } + if (Modifier.isFinal(mods) && + MethodHandleNatives.refKindIsSetter(refKind)) + throw m.makeAccessException("unexpected set of a final field", this); +@@ -1316,6 +1442,10 @@ : resolveOrFail(refKind, defc, name, (Class<?>) type); return getDirectField(refKind, defc, field); } else if (MethodHandleNatives.refKindIsMethod(refKind)) { @@ -58740,7 +60558,17 @@ MemberName method = (resolved != null) ? resolved : resolveOrFail(refKind, defc, name, (MethodType) type); return getDirectMethod(refKind, defc, method, lookupClass); -@@ -1603,6 +1616,7 @@ +@@ -1386,6 +1516,9 @@ + * <p> + * Before invoking its target, the invoker will spread the final array, apply + * reference casts as necessary, and unbox and widen primitive arguments. ++ * If, when the invoker is called, the supplied array argument does ++ * not have the correct number of elements, the invoker will throw ++ * an {@link IllegalArgumentException} instead of invoking the target. + * <p> + * This method is equivalent to the following code (though it may be more efficient): + * <p><blockquote><pre> +@@ -1603,6 +1736,7 @@ */ public static MethodHandle permuteArguments(MethodHandle target, MethodType newType, int... reorder) { @@ -58748,7 +60576,7 @@ checkReorder(reorder, newType, target.type()); return target.permuteArguments(newType, reorder); } -@@ -1797,6 +1811,7 @@ +@@ -1797,6 +1931,7 @@ throw newIllegalArgumentException("no argument type to remove"); ArrayList<Class<?>> ptypes = new ArrayList<>(oldType.parameterList()); ptypes.addAll(pos, valueTypes); @@ -58757,7 +60585,7 @@ return target.dropArguments(newType, pos, dropped); } --- ./jdk/src/share/classes/java/lang/ref/Finalizer.java 2013-09-06 11:28:10.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/ref/Finalizer.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/ref/Finalizer.java 2014-07-15 23:24:36.000000000 -0700 @@ -27,17 +27,14 @@ import java.security.PrivilegedAction; @@ -58876,7 +60704,7 @@ } } --- ./jdk/src/share/classes/java/lang/reflect/Proxy.java 2013-09-06 11:28:11.000000000 -0700 -+++ ./jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -58941,7 +60769,24 @@ /** * the invocation handler for this proxy instance. -@@ -464,131 +448,190 @@ +@@ -412,12 +396,13 @@ + Class<?>... interfaces) + throws IllegalArgumentException + { +- SecurityManager sm = System.getSecurityManager(); ++ final Class<?>[] intfs = interfaces.clone(); ++ final SecurityManager sm = System.getSecurityManager(); + if (sm != null) { +- checkProxyAccess(Reflection.getCallerClass(), loader, interfaces); ++ checkProxyAccess(Reflection.getCallerClass(), loader, intfs); + } + +- return getProxyClass0(loader, interfaces); ++ return getProxyClass0(loader, intfs); + } + + /* +@@ -464,131 +449,190 @@ throw new IllegalArgumentException("interface limit exceeded"); } @@ -59241,7 +61086,7 @@ String proxyPkg = null; // package to define proxy class in /* -@@ -596,10 +639,10 @@ +@@ -596,10 +640,10 @@ * proxy class will be defined in the same package. Verify that * all non-public proxy interfaces are in the same package. */ @@ -59255,7 +61100,7 @@ int n = name.lastIndexOf('.'); String pkg = ((n == -1) ? "" : name.substring(0, n + 1)); if (proxyPkg == null) { -@@ -616,60 +659,31 @@ +@@ -616,60 +660,31 @@ proxyPkg = ReflectUtil.PROXY_PACKAGE + "."; } @@ -59336,7 +61181,26 @@ } /** -@@ -773,11 +787,7 @@ +@@ -711,15 +726,16 @@ + throw new NullPointerException(); + } + ++ final Class<?>[] intfs = interfaces.clone(); + final SecurityManager sm = System.getSecurityManager(); + if (sm != null) { +- checkProxyAccess(Reflection.getCallerClass(), loader, interfaces); ++ checkProxyAccess(Reflection.getCallerClass(), loader, intfs); + } + + /* + * Look up or generate the designated proxy class. + */ +- Class<?> cl = getProxyClass0(loader, interfaces); ++ Class<?> cl = getProxyClass0(loader, intfs); + + /* + * Invoke its constructor with the designated invocation handler. +@@ -773,11 +789,7 @@ * @throws NullPointerException if {@code cl} is {@code null} */ public static boolean isProxyClass(Class<?> cl) { @@ -59349,7 +61213,7 @@ } /** -@@ -788,6 +798,7 @@ +@@ -788,6 +800,7 @@ * @throws IllegalArgumentException if the argument is not a * proxy instance */ @@ -59357,7 +61221,7 @@ public static InvocationHandler getInvocationHandler(Object proxy) throws IllegalArgumentException { -@@ -798,8 +809,19 @@ +@@ -798,8 +811,19 @@ throw new IllegalArgumentException("not a proxy instance"); } @@ -59380,7 +61244,7 @@ private static native Class defineClass0(ClassLoader loader, String name, --- ./jdk/src/share/classes/java/lang/reflect/WeakCache.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/classes/java/lang/reflect/WeakCache.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/lang/reflect/WeakCache.java 2014-07-15 23:24:36.000000000 -0700 @@ -0,0 +1,393 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -59776,7 +61640,7 @@ + } +} --- ./jdk/src/share/classes/java/net/IDN.java 2013-09-06 11:28:11.000000000 -0700 -+++ ./jdk/src/share/classes/java/net/IDN.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/net/IDN.java 2014-07-15 23:24:36.000000000 -0700 @@ -271,13 +271,17 @@ if (useSTD3ASCIIRules) { for (int i = 0; i < dest.length(); i++) { @@ -59839,7 +61703,7 @@ // search dots in a string and return the index of that character; // or if there is no dots, return the length of input string --- ./jdk/src/share/classes/java/net/Inet6Address.java 2013-09-06 11:28:11.000000000 -0700 -+++ ./jdk/src/share/classes/java/net/Inet6Address.java 2013-12-01 11:14:29.000000000 -0800 ++++ ./jdk/src/share/classes/java/net/Inet6Address.java 2014-07-15 23:24:36.000000000 -0700 @@ -26,6 +26,8 @@ package java.net; @@ -60556,7 +62420,7 @@ - } } --- ./jdk/src/share/classes/java/net/InetAddress.java 2013-09-06 11:28:11.000000000 -0700 -+++ ./jdk/src/share/classes/java/net/InetAddress.java 2013-12-01 11:14:29.000000000 -0800 ++++ ./jdk/src/share/classes/java/net/InetAddress.java 2014-07-15 23:24:36.000000000 -0700 @@ -213,6 +213,13 @@ this.family = family; } @@ -60580,7 +62444,7 @@ } --- ./jdk/src/share/classes/java/net/Socket.java 2013-09-06 11:28:11.000000000 -0700 -+++ ./jdk/src/share/classes/java/net/Socket.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/java/net/Socket.java 2014-07-15 23:24:36.000000000 -0700 @@ -624,6 +624,10 @@ InetAddress addr = epoint.getAddress(); int port = epoint.getPort(); @@ -60593,7 +62457,7 @@ bound = true; } --- ./jdk/src/share/classes/java/net/SocketPermission.java 2013-09-06 11:28:11.000000000 -0700 -+++ ./jdk/src/share/classes/java/net/SocketPermission.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/java/net/SocketPermission.java 2014-07-15 23:24:36.000000000 -0700 @@ -34,6 +34,9 @@ import java.net.InetAddress; import java.security.Permission; @@ -60753,7 +62617,7 @@ public String toString() { --- ./jdk/src/share/classes/java/nio/charset/Charset.java 2013-09-06 11:28:12.000000000 -0700 -+++ ./jdk/src/share/classes/java/nio/charset/Charset.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/nio/charset/Charset.java 2014-07-15 23:24:36.000000000 -0700 @@ -426,39 +426,32 @@ } @@ -60828,7 +62692,7 @@ CharsetProvider cp = (CharsetProvider)i.next(); put(cp.charsets(), m); --- ./jdk/src/share/classes/java/nio/file/Files.java 2013-09-06 11:28:12.000000000 -0700 -+++ ./jdk/src/share/classes/java/nio/file/Files.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/nio/file/Files.java 2014-07-15 23:24:36.000000000 -0700 @@ -28,6 +28,8 @@ import java.nio.file.attribute.*; import java.nio.file.spi.FileSystemProvider; @@ -60943,8 +62807,105 @@ } } +--- ./jdk/src/share/classes/java/security/Provider.java 2013-09-06 11:28:13.000000000 -0700 ++++ ./jdk/src/share/classes/java/security/Provider.java 2014-07-15 23:24:36.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1996, 2014, 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 +@@ -1017,7 +1017,7 @@ + * <p>This class defines the methods {@link #supportsParameter + * supportsParameter()} and {@link #newInstance newInstance()} + * which are used by the Java security framework when it searches for +- * suitable services and instantes them. The valid arguments to those ++ * suitable services and instantiates them. The valid arguments to those + * methods depend on the type of service. For the service types defined + * within Java SE, see the + * <a href="../../../technotes/guides/security/crypto/CryptoSpec.html"> +@@ -1207,7 +1207,7 @@ + * + * @throws InvalidParameterException if the value of + * constructorParameter is invalid for this type of service. +- * @throws NoSuchAlgorithmException if instantation failed for ++ * @throws NoSuchAlgorithmException if instantiation failed for + * any other reason. + */ + public Object newInstance(Object constructorParameter) +@@ -1235,7 +1235,9 @@ + + " engines"); + } + Class clazz = getImplClass(); +- return clazz.newInstance(); ++ Class<?>[] empty = {}; ++ Constructor<?> con = clazz.getConstructor(empty); ++ return con.newInstance(); + } else { + Class paramClass = cap.getConstructorParameterClass(); + if (constructorParameter != null) { +@@ -1278,13 +1280,18 @@ + } else { + clazz = cl.loadClass(className); + } ++ if (!Modifier.isPublic(clazz.getModifiers())) { ++ throw new NoSuchAlgorithmException ++ ("class configured for " + type + " (provider: " + ++ provider.getName() + ") is not public."); ++ } + classRef = new WeakReference<Class>(clazz); + } + return clazz; + } catch (ClassNotFoundException e) { + throw new NoSuchAlgorithmException + ("class configured for " + type + "(provider: " + +- provider.getName() + ")" + "cannot be found.", e); ++ provider.getName() + ") cannot be found.", e); + } + } + +@@ -1297,15 +1304,21 @@ + throws Exception { + Class clazz = getImplClass(); + if (constructorParameter == null) { +- Object o = clazz.newInstance(); +- return o; ++ // create instance with public no-arg constructor if it exists ++ try { ++ Class<?>[] empty = {}; ++ Constructor<?> con = clazz.getConstructor(empty); ++ return con.newInstance(); ++ } catch (NoSuchMethodException e) { ++ throw new NoSuchAlgorithmException("No public no-arg " ++ + "constructor found in class " + className); ++ } + } + Class argClass = constructorParameter.getClass(); + Constructor[] cons = clazz.getConstructors(); + // find first public constructor that can take the + // argument as parameter +- for (int i = 0; i < cons.length; i++) { +- Constructor con = cons[i]; ++ for (Constructor<?> con : cons) { + Class[] paramTypes = con.getParameterTypes(); + if (paramTypes.length != 1) { + continue; +@@ -1313,10 +1326,9 @@ + if (paramTypes[0].isAssignableFrom(argClass) == false) { + continue; + } +- Object o = con.newInstance(new Object[] {constructorParameter}); +- return o; ++ return con.newInstance(constructorParameter); + } +- throw new NoSuchAlgorithmException("No constructor matching " ++ throw new NoSuchAlgorithmException("No public constructor matching " + + argClass.getName() + " found in class " + className); + } + --- ./jdk/src/share/classes/java/util/ComparableTimSort.java 2013-09-06 11:28:15.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/ComparableTimSort.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/ComparableTimSort.java 2014-07-15 23:24:36.000000000 -0700 @@ -131,7 +131,7 @@ */ int stackLen = (len < 120 ? 5 : @@ -60955,7 +62916,7 @@ runLen = new int[stackLen]; } --- ./jdk/src/share/classes/java/util/HashMap.java 2013-09-06 11:28:15.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/HashMap.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/HashMap.java 2014-07-15 23:24:36.000000000 -0700 @@ -300,13 +300,9 @@ private static int roundUpToPowerOf2(int number) { @@ -60973,7 +62934,7 @@ /** --- ./jdk/src/share/classes/java/util/ServiceLoader.java 2013-09-06 11:28:15.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/ServiceLoader.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/ServiceLoader.java 2014-07-15 23:24:36.000000000 -0700 @@ -375,7 +375,7 @@ return p; } catch (Throwable x) { @@ -60984,7 +62945,7 @@ } throw new Error(); // This cannot happen --- ./jdk/src/share/classes/java/util/TimSort.java 2013-09-06 11:28:15.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/TimSort.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/TimSort.java 2014-07-15 23:24:36.000000000 -0700 @@ -158,7 +158,7 @@ */ int stackLen = (len < 120 ? 5 : @@ -60995,7 +62956,7 @@ runLen = new int[stackLen]; } --- ./jdk/src/share/classes/java/util/TimeZone.java 2013-09-06 11:28:15.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/TimeZone.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/TimeZone.java 2014-07-15 23:24:36.000000000 -0700 @@ -165,6 +165,11 @@ // Proclaim serialization compatibility with JDK 1.1 static final long serialVersionUID = 3581463369166924961L; @@ -61099,8 +63060,19 @@ } return zi; } +--- ./jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java 2013-09-06 11:28:16.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java 2014-07-15 23:24:36.000000000 -0700 +@@ -221,6 +221,8 @@ + + if (vclass != fieldClass) + throw new ClassCastException(); ++ if (vclass.isPrimitive()) ++ throw new IllegalArgumentException("Must be reference type"); + + if (!Modifier.isVolatile(modifiers)) + throw new IllegalArgumentException("Must be volatile type"); --- ./jdk/src/share/classes/java/util/jar/JarFile.java 2013-09-06 11:28:16.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/jar/JarFile.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/jar/JarFile.java 2014-07-15 23:24:36.000000000 -0700 @@ -38,6 +38,7 @@ import sun.security.action.GetPropertyAction; import sun.security.util.ManifestEntryVerifier; @@ -61129,7 +63101,7 @@ mev = new ManifestEntryVerifier (getManifestFromReference()); --- ./jdk/src/share/classes/java/util/jar/JarVerifier.java 2013-09-06 11:28:16.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/jar/JarVerifier.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/jar/JarVerifier.java 2014-07-15 23:24:36.000000000 -0700 @@ -32,6 +32,7 @@ import java.security.cert.CertificateException; import java.util.zip.ZipEntry; @@ -61208,7 +63180,7 @@ private Enumeration<String> unsignedEntryNames(JarFile jar) { --- ./jdk/src/share/classes/java/util/logging/Level.java 2013-09-06 11:28:16.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/logging/Level.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/logging/Level.java 2014-07-15 23:24:36.000000000 -0700 @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.HashMap; @@ -61345,7 +63317,7 @@ return this.value; } --- ./jdk/src/share/classes/java/util/logging/LogManager.java 2013-09-06 11:28:16.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/logging/LogManager.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/logging/LogManager.java 2014-07-15 23:24:36.000000000 -0700 @@ -149,7 +149,15 @@ // The global LogManager object private static LogManager manager; @@ -61632,7 +63604,7 @@ } --- ./jdk/src/share/classes/java/util/logging/Logger.java 2013-09-06 11:28:16.000000000 -0700 -+++ ./jdk/src/share/classes/java/util/logging/Logger.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/java/util/logging/Logger.java 2014-07-15 23:24:36.000000000 -0700 @@ -174,11 +174,11 @@ public class Logger { private static final Handler emptyHandlers[] = new Handler[0]; @@ -61762,7 +63734,7 @@ return null; } --- ./jdk/src/share/classes/javax/management/BadAttributeValueExpException.java 2013-09-06 11:28:18.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/BadAttributeValueExpException.java 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/src/share/classes/javax/management/BadAttributeValueExpException.java 2014-07-15 23:24:36.000000000 -0700 @@ -25,6 +25,9 @@ package javax.management; @@ -61809,7 +63781,7 @@ + } } --- ./jdk/src/share/classes/javax/management/MBeanAttributeInfo.java 2013-09-06 11:28:18.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/MBeanAttributeInfo.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/management/MBeanAttributeInfo.java 2014-07-15 23:24:36.000000000 -0700 @@ -30,6 +30,7 @@ import com.sun.jmx.mbeanserver.GetPropertyAction; @@ -61843,7 +63815,7 @@ private static boolean isIs(Method getter) { --- ./jdk/src/share/classes/javax/management/MBeanConstructorInfo.java 2013-09-06 11:28:18.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/MBeanConstructorInfo.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/management/MBeanConstructorInfo.java 2014-07-15 23:24:36.000000000 -0700 @@ -29,6 +29,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; @@ -61880,7 +63852,7 @@ private static MBeanParameterInfo[] constructorSignature(Constructor<?> cn) { --- ./jdk/src/share/classes/javax/management/MBeanFeatureInfo.java 2013-09-06 11:28:18.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/MBeanFeatureInfo.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/management/MBeanFeatureInfo.java 2014-07-15 23:24:36.000000000 -0700 @@ -30,6 +30,7 @@ import java.io.ObjectOutputStream; import java.io.Serializable; @@ -61903,7 +63875,7 @@ public int hashCode() { --- ./jdk/src/share/classes/javax/management/MBeanInfo.java 2013-09-06 11:28:18.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/MBeanInfo.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/management/MBeanInfo.java 2014-07-15 23:24:36.000000000 -0700 @@ -36,6 +36,7 @@ import java.util.WeakHashMap; import java.security.AccessController; @@ -61943,7 +63915,7 @@ * Cached results of previous calls to arrayGettersSafe. This is * a WeakHashMap so that we don't prevent a class from being --- ./jdk/src/share/classes/javax/management/MBeanNotificationInfo.java 2013-09-06 11:28:18.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/MBeanNotificationInfo.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/management/MBeanNotificationInfo.java 2014-07-15 23:24:36.000000000 -0700 @@ -25,7 +25,11 @@ package javax.management; @@ -62003,7 +63975,7 @@ + } } --- ./jdk/src/share/classes/javax/management/MBeanOperationInfo.java 2013-09-06 11:28:18.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/MBeanOperationInfo.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/management/MBeanOperationInfo.java 2014-07-15 23:24:36.000000000 -0700 @@ -29,6 +29,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -62039,7 +64011,7 @@ private static MBeanParameterInfo[] methodSignature(Method method) { --- ./jdk/src/share/classes/javax/management/MBeanParameterInfo.java 2013-09-06 11:28:18.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/MBeanParameterInfo.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/management/MBeanParameterInfo.java 2014-07-15 23:24:36.000000000 -0700 @@ -25,6 +25,8 @@ package javax.management; @@ -62069,7 +64041,7 @@ } } --- ./jdk/src/share/classes/javax/management/MBeanTrustPermission.java 2013-09-06 11:28:18.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/MBeanTrustPermission.java 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/src/share/classes/javax/management/MBeanTrustPermission.java 2014-07-15 23:24:36.000000000 -0700 @@ -26,6 +26,9 @@ package javax.management; @@ -62119,7 +64091,7 @@ } } --- ./jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-09-06 11:28:18.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. @@ -62152,7 +64124,7 @@ \ No newline at end of file +} --- ./jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java 2013-09-06 11:28:19.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java 2014-07-15 23:24:36.000000000 -0700 @@ -31,6 +31,7 @@ // import java.util.Arrays; @@ -62184,7 +64156,7 @@ value += arraySetHash(this.getConstructors()); value += arraySetHash(this.getOperations()); --- ./jdk/src/share/classes/javax/management/relation/RelationNotification.java 2013-09-06 11:28:19.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/relation/RelationNotification.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/management/relation/RelationNotification.java 2014-07-15 23:24:36.000000000 -0700 @@ -260,7 +260,7 @@ super(notifType, sourceObj, sequence, timeStamp, message); @@ -62235,7 +64207,7 @@ } --- ./jdk/src/share/classes/javax/management/remote/JMXPrincipal.java 2013-09-06 11:28:19.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/remote/JMXPrincipal.java 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/src/share/classes/javax/management/remote/JMXPrincipal.java 2014-07-15 23:24:36.000000000 -0700 @@ -26,6 +26,9 @@ package javax.management.remote; @@ -62279,7 +64251,7 @@ + } } --- ./jdk/src/share/classes/javax/management/remote/JMXServiceURL.java 2013-09-06 11:28:19.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/remote/JMXServiceURL.java 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/src/share/classes/javax/management/remote/JMXServiceURL.java 2014-07-15 23:24:36.000000000 -0700 @@ -29,6 +29,9 @@ import com.sun.jmx.remote.util.ClassLogger; @@ -62440,7 +64412,7 @@ /** * Cached result of {@link #toString()}. --- ./jdk/src/share/classes/javax/management/remote/NotificationResult.java 2013-09-06 11:28:19.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/remote/NotificationResult.java 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/src/share/classes/javax/management/remote/NotificationResult.java 2014-07-15 23:24:36.000000000 -0700 @@ -25,6 +25,9 @@ package javax.management.remote; @@ -62515,7 +64487,7 @@ + } } --- ./jdk/src/share/classes/javax/management/remote/TargetedNotification.java 2013-09-06 11:28:19.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/remote/TargetedNotification.java 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/src/share/classes/javax/management/remote/TargetedNotification.java 2014-07-15 23:24:36.000000000 -0700 @@ -26,6 +26,9 @@ package javax.management.remote; @@ -62580,7 +64552,7 @@ + } } --- ./jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java 2013-09-06 11:28:19.000000000 -0700 -+++ ./jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/management/remote/rmi/RMIConnector.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. @@ -62713,7 +64685,7 @@ private transient RMINotifClient rmiNotifClient; // = new RMINotifClient(new Integer(0)); --- ./jdk/src/share/classes/javax/print/SimpleDoc.java 2013-09-06 11:28:20.000000000 -0700 -+++ ./jdk/src/share/classes/javax/print/SimpleDoc.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/javax/print/SimpleDoc.java 2014-07-15 23:24:36.000000000 -0700 @@ -91,7 +91,10 @@ Class repClass = null; @@ -62727,7 +64699,7 @@ throw new IllegalArgumentException("unknown representation class"); } --- ./jdk/src/share/classes/javax/script/ScriptEngineManager.java 2013-09-06 11:28:21.000000000 -0700 -+++ ./jdk/src/share/classes/javax/script/ScriptEngineManager.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/javax/script/ScriptEngineManager.java 2014-07-15 23:24:36.000000000 -0700 @@ -85,15 +85,18 @@ nameAssociations = new HashMap<String, ScriptEngineFactory>(); extensionAssociations = new HashMap<String, ScriptEngineFactory>(); @@ -62783,7 +64755,7 @@ /** --- ./jdk/src/share/classes/javax/security/auth/Policy.java 2013-09-06 11:28:21.000000000 -0700 -+++ ./jdk/src/share/classes/javax/security/auth/Policy.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/javax/security/auth/Policy.java 2014-07-15 23:24:36.000000000 -0700 @@ -26,6 +26,10 @@ package javax.security.auth; @@ -62874,7 +64846,7 @@ throw new SecurityException (sun.security.util.ResourcesMgr.getString --- ./jdk/src/share/classes/javax/security/auth/Subject.java 2013-09-06 11:28:21.000000000 -0700 -+++ ./jdk/src/share/classes/javax/security/auth/Subject.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/javax/security/auth/Subject.java 2014-07-15 23:24:36.000000000 -0700 @@ -941,10 +941,30 @@ /** * Reads this object from a stream (i.e., deserializes it) @@ -62924,7 +64896,7 @@ } --- ./jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java 2013-09-06 11:28:21.000000000 -0700 -+++ ./jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/src/share/classes/javax/security/auth/kerberos/KeyTab.java 2014-07-15 23:24:36.000000000 -0700 @@ -26,6 +26,7 @@ package javax.security.auth.kerberos; @@ -62955,7 +64927,7 @@ /** --- ./jdk/src/share/classes/javax/security/auth/login/Configuration.java 2013-09-06 11:28:21.000000000 -0700 -+++ ./jdk/src/share/classes/javax/security/auth/login/Configuration.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/javax/security/auth/login/Configuration.java 2014-07-15 23:24:36.000000000 -0700 @@ -27,9 +27,6 @@ import javax.security.auth.AuthPermission; @@ -63033,7 +65005,7 @@ Exception ee = e.getException(); if (ee instanceof InstantiationException) { --- ./jdk/src/share/classes/javax/security/auth/login/LoginContext.java 2013-09-06 11:28:21.000000000 -0700 -+++ ./jdk/src/share/classes/javax/security/auth/login/LoginContext.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/javax/security/auth/login/LoginContext.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. @@ -63277,7 +65249,7 @@ (moduleStack[i].module, args)).booleanValue(); --- ./jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java 2013-09-06 11:28:22.000000000 -0700 -+++ ./jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/javax/sql/rowset/RowSetProvider.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. @@ -63339,7 +65311,7 @@ } } --- ./jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java 2013-09-06 11:28:22.000000000 -0700 -+++ ./jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/javax/sql/rowset/serial/SQLInputImpl.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. @@ -63373,7 +65345,7 @@ // get the attributes from the struct Object attribs[] = s.getAttributes(map); --- ./jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2013-09-06 11:28:22.000000000 -0700 -+++ ./jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/javax/sql/rowset/spi/SyncFactory.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. @@ -63507,7 +65479,7 @@ **/ c = Class.forName(providerID, true, cl); --- ./jdk/src/share/classes/javax/swing/JTable.java 2013-09-06 11:28:23.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/JTable.java 2013-12-01 11:14:31.000000000 -0800 ++++ ./jdk/src/share/classes/javax/swing/JTable.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -63556,7 +65528,7 @@ } catch (Exception e) { --- ./jdk/src/share/classes/javax/swing/SwingUtilities.java 2013-09-06 11:28:23.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/SwingUtilities.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/javax/swing/SwingUtilities.java 2014-07-15 23:24:37.000000000 -0700 @@ -24,6 +24,7 @@ */ package javax.swing; @@ -63584,7 +65556,7 @@ getContextClassLoader()); } --- ./jdk/src/share/classes/javax/swing/UIDefaults.java 2013-09-06 11:28:24.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/UIDefaults.java 2013-12-01 11:14:31.000000000 -0800 ++++ ./jdk/src/share/classes/javax/swing/UIDefaults.java 2014-07-15 23:24:37.000000000 -0700 @@ -53,6 +53,7 @@ import sun.reflect.misc.MethodUtil; @@ -63626,7 +65598,7 @@ * Coerce the array of class types provided into one which * looks the way the Reflection APIs expect. This is done --- ./jdk/src/share/classes/javax/swing/event/EventListenerList.java 2013-09-06 11:28:24.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/event/EventListenerList.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/classes/javax/swing/event/EventListenerList.java 2014-07-15 23:24:37.000000000 -0700 @@ -27,6 +27,7 @@ import java.io.*; import java.util.*; @@ -63646,8 +65618,20 @@ } } +--- ./jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java 2013-09-06 11:28:24.000000000 -0700 ++++ ./jdk/src/share/classes/javax/swing/filechooser/FileSystemView.java 2014-07-15 23:24:37.000000000 -0700 +@@ -718,7 +718,8 @@ + * @return the Desktop folder. + */ + public File getHomeDirectory() { +- return getRoots()[0]; ++ File[] roots = getRoots(); ++ return (roots.length == 0) ? null : roots[0]; + } + + /** --- ./jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java 2013-09-06 11:28:25.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -63677,7 +65661,7 @@ if(cellEditor.shouldSelectCell(event)) { stopEditingInCompleteEditing = false; --- ./jdk/src/share/classes/javax/swing/text/DefaultFormatter.java 2013-09-06 11:28:27.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/text/DefaultFormatter.java 2013-12-01 11:14:31.000000000 -0800 ++++ ./jdk/src/share/classes/javax/swing/text/DefaultFormatter.java 2014-07-15 23:24:37.000000000 -0700 @@ -24,7 +24,8 @@ */ package javax.swing.text; @@ -63708,7 +65692,7 @@ } catch (Throwable ex) { throw new ParseException("Error creating instance", 0); --- ./jdk/src/share/classes/javax/swing/text/FlowView.java 2013-09-06 11:28:27.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/text/FlowView.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/swing/text/FlowView.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. @@ -63740,7 +65724,7 @@ // simply keep the class from being abstract. --- ./jdk/src/share/classes/javax/swing/text/GlyphView.java 2013-09-06 11:28:27.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/text/GlyphView.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/swing/text/GlyphView.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. @@ -63758,7 +65742,7 @@ int yTmp = y + 1; g.drawLine(x0, yTmp, x1, yTmp); --- ./jdk/src/share/classes/javax/swing/text/NumberFormatter.java 2013-09-06 11:28:27.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/text/NumberFormatter.java 2013-12-01 11:14:31.000000000 -0800 ++++ ./jdk/src/share/classes/javax/swing/text/NumberFormatter.java 2014-07-15 23:24:37.000000000 -0700 @@ -27,6 +27,8 @@ import java.lang.reflect.*; import java.text.*; @@ -63783,7 +65767,7 @@ } } catch (Throwable ex) { } --- ./jdk/src/share/classes/javax/swing/text/View.java 2013-09-06 11:28:27.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/text/View.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/javax/swing/text/View.java 2014-07-15 23:24:37.000000000 -0700 @@ -1137,32 +1137,9 @@ */ protected void forwardUpdate(DocumentEvent.ElementChange ec, @@ -63890,7 +65874,7 @@ + }; --- ./jdk/src/share/classes/javax/swing/text/html/ObjectView.java 2013-09-06 11:28:27.000000000 -0700 -+++ ./jdk/src/share/classes/javax/swing/text/html/ObjectView.java 2013-12-01 11:14:31.000000000 -0800 ++++ ./jdk/src/share/classes/javax/swing/text/html/ObjectView.java 2014-07-15 23:24:37.000000000 -0700 @@ -31,6 +31,9 @@ import java.beans.*; import java.lang.reflect.*; @@ -63948,7 +65932,7 @@ System.err.println("Invocation failed"); // invocation code --- ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java 2013-09-06 11:28:29.000000000 -0700 -+++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_ja.java 2014-07-15 23:24:34.000000000 -0700 @@ -57,9 +57,9 @@ {"appletviewer.appletinfo.applet", "-- \u30A2\u30D7\u30EC\u30C3\u30C8\u60C5\u5831\u306A\u3057 --"}, {"appletviewer.appletinfo.param", "-- \u30D1\u30E9\u30E1\u30FC\u30BF\u60C5\u5831\u306A\u3057 --"}, @@ -63981,7 +65965,7 @@ {"appletpanel.fileexception", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u4F8B\u5916\u304C\u767A\u751F\u3057\u307E\u3057\u305F"}, {"appletpanel.filedeath", "{1}\u306E\u30ED\u30FC\u30C9\u4E2D\u306B{0}\u304C\u5F37\u5236\u7D42\u4E86\u3057\u307E\u3057\u305F"}, --- ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java 2013-09-06 11:28:29.000000000 -0700 -+++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java 2014-07-15 23:24:34.000000000 -0700 @@ -93,7 +93,7 @@ {"appletviewer.main.nosecmgr", "Advert\u00EAncia: SecurityManager n\u00E3o instalado!"}, {"appletviewer.main.warning", "Advert\u00EAncia: Nenhum applet iniciado. Certifique-se de que a entrada contenha uma tag <applet>."}, @@ -63992,7 +65976,7 @@ {"appletioexception.loadclass.throw.notloaded", "classe n\u00E3o carregada: {0}"}, {"appletclassloader.loadcode.verbose", "Fluxo de abertura para: {0} para obter {1}"}, --- ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java 2013-09-06 11:28:29.000000000 -0700 -+++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/applet/resources/MsgAppletViewer_sv.java 2014-07-15 23:24:34.000000000 -0700 @@ -85,7 +85,7 @@ {"appletviewer.main.prop.store", "Anv\u00E4ndarspecifika egenskaper f\u00F6r AppletViewer"}, {"appletviewer.main.err.prop.cantread", "Kan inte l\u00E4sa egenskapsfilen: {0}"}, @@ -64003,7 +65987,7 @@ {"appletviewer.main.debug.cantfindmain", "Hittar inte huvudmetoden i fels\u00F6kningsprogrammet!"}, {"appletviewer.main.debug.exceptionindebug", "Undantag i fels\u00F6kningsprogrammet!"}, --- ./jdk/src/share/classes/sun/awt/AWTAccessor.java 2013-09-06 11:28:29.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/AWTAccessor.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/AWTAccessor.java 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. @@ -64119,7 +66103,7 @@ + } } --- ./jdk/src/share/classes/sun/awt/AWTAutoShutdown.java 2013-09-06 11:28:29.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/AWTAutoShutdown.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/AWTAutoShutdown.java 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. @@ -64172,8 +66156,29 @@ blockerThread = thread; thread.start(); --- ./jdk/src/share/classes/sun/awt/AppContext.java 2013-09-06 11:28:29.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/AppContext.java 2014-04-19 01:27:13.000000000 -0700 -@@ -837,21 +837,68 @@ ++++ ./jdk/src/share/classes/sun/awt/AppContext.java 2014-07-15 23:24:34.000000000 -0700 +@@ -323,6 +323,20 @@ + while (context == null) { + threadGroup = threadGroup.getParent(); + if (threadGroup == null) { ++ // We've got up to the root thread group and did not find an AppContext ++ // Try to get it from the security manager ++ SecurityManager securityManager = System.getSecurityManager(); ++ if (securityManager != null) { ++ ThreadGroup smThreadGroup = securityManager.getThreadGroup(); ++ if (smThreadGroup != null) { ++ /* ++ * If we get this far then it's likely that ++ * the ThreadGroup does not actually belong ++ * to the applet, so do not cache it. ++ */ ++ return threadGroup2appContext.get(smThreadGroup); ++ } ++ } + return null; + } + context = threadGroup2appContext.get(threadGroup); +@@ -837,21 +851,68 @@ public boolean isMainAppContext() { return (numAppContexts.get() == 1 && mainAppContext != null); } @@ -64256,7 +66261,23 @@ } } --- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2013-09-06 11:28:30.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2014-07-15 23:24:34.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1996, 2014, 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 +@@ -867,7 +867,7 @@ + return descriptors; + } + +- private FontDescriptor[] buildFontDescriptors(int fontIndex, int styleIndex) { ++ protected FontDescriptor[] buildFontDescriptors(int fontIndex, int styleIndex) { + String fontName = fontNames[fontIndex]; + String styleName = styleNames[styleIndex]; + @@ -1146,7 +1146,7 @@ */ HashMap<String, Boolean> existsMap; @@ -64267,7 +66288,7 @@ } else if (existsMap == null) { existsMap = new HashMap<String, Boolean>(); --- ./jdk/src/share/classes/sun/awt/OSInfo.java 2013-09-06 11:28:30.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2014-07-15 23:24:34.000000000 -0700 @@ -39,6 +39,7 @@ WINDOWS, LINUX, @@ -64288,7 +66309,7 @@ return MACOSX; } --- ./jdk/src/share/classes/sun/awt/SunToolkit.java 2013-09-06 11:28:30.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/SunToolkit.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/SunToolkit.java 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -64305,7 +66326,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; --- ./jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java 2013-09-06 11:28:30.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/datatransfer/ClipboardTransferable.java 2014-07-15 23:24:34.000000000 -0700 @@ -87,7 +87,7 @@ HashMap cached_data = new HashMap(formats.length, 1.0f); @@ -64326,7 +66347,7 @@ } finally { clipboard.closeClipboard(); --- ./jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java 2013-09-06 11:28:30.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/datatransfer/DataTransferer.java 2014-07-15 23:24:34.000000000 -0700 @@ -2406,15 +2406,6 @@ } @@ -64417,7 +66438,7 @@ } --- ./jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java 2013-09-06 11:28:30.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/datatransfer/SunClipboard.java 2014-07-15 23:24:34.000000000 -0700 @@ -64,9 +64,6 @@ public abstract class SunClipboard extends Clipboard implements PropertyChangeListener { @@ -64464,7 +66485,7 @@ + } } --- ./jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties 2013-09-06 11:28:30.000000000 -0700 -+++ ./jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/awt/resources/awt_pt_BR.properties 2014-07-15 23:24:34.000000000 -0700 @@ -151,7 +151,7 @@ AWT.undefined=Indefinido @@ -64488,7 +66509,7 @@ # Input method related strings AWT.CompositionWindowTitle=Janela de Entrada --- ./jdk/src/share/classes/sun/font/CreatedFontTracker.java 2013-09-06 11:28:31.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/CreatedFontTracker.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/sun/font/CreatedFontTracker.java 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. @@ -64561,7 +66582,7 @@ } --- ./jdk/src/share/classes/sun/font/FileFont.java 2013-09-06 11:28:31.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/FileFont.java 2013-12-01 11:14:33.000000000 -0800 ++++ ./jdk/src/share/classes/sun/font/FileFont.java 2014-07-15 23:24:34.000000000 -0700 @@ -170,7 +170,9 @@ } } @@ -64574,7 +66595,7 @@ } --- ./jdk/src/share/classes/sun/font/FontUtilities.java 2013-09-06 11:28:31.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2014-07-15 23:24:34.000000000 -0700 @@ -48,6 +48,8 @@ public static boolean isLinux; @@ -64597,7 +66618,7 @@ String t2kStr = System.getProperty("sun.java2d.font.scaler"); --- ./jdk/src/share/classes/sun/font/GlyphLayout.java 2013-09-06 11:28:31.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/GlyphLayout.java 2013-12-01 11:14:33.000000000 -0800 ++++ ./jdk/src/share/classes/sun/font/GlyphLayout.java 2014-07-15 23:24:34.000000000 -0700 @@ -468,9 +468,10 @@ _gvdata.grow(); } @@ -64613,7 +66634,7 @@ } --- ./jdk/src/share/classes/sun/font/StandardGlyphVector.java 2013-09-06 11:28:31.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/StandardGlyphVector.java 2013-12-01 11:14:33.000000000 -0800 ++++ ./jdk/src/share/classes/sun/font/StandardGlyphVector.java 2014-07-15 23:24:34.000000000 -0700 @@ -1740,8 +1740,9 @@ tx, sgv.font.getStyle(), @@ -64627,7 +66648,7 @@ return new GlyphStrike(sgv, strike, dx, dy); } --- ./jdk/src/share/classes/sun/font/SunFontManager.java 2013-09-06 11:28:31.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. @@ -64692,7 +66713,7 @@ } } --- ./jdk/src/share/classes/sun/font/TrueTypeFont.java 2013-09-06 11:28:31.000000000 -0700 -+++ ./jdk/src/share/classes/sun/font/TrueTypeFont.java 2013-12-01 11:14:33.000000000 -0800 ++++ ./jdk/src/share/classes/sun/font/TrueTypeFont.java 2014-07-15 23:24:34.000000000 -0700 @@ -1037,6 +1037,9 @@ if (head_Table != null && head_Table.capacity() >= 18) { ShortBuffer sb = head_Table.asShortBuffer(); @@ -64703,8 +66724,68 @@ } ByteBuffer os2_Table = getTableBuffer(os_2Tag); +--- ./jdk/src/share/classes/sun/invoke/util/VerifyAccess.java 2013-09-06 11:28:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/invoke/util/VerifyAccess.java 2014-07-15 23:24:34.000000000 -0700 +@@ -89,35 +89,28 @@ + if (allowedModes == 0) return false; + assert((allowedModes & PUBLIC) != 0 && + (allowedModes & ~(ALL_ACCESS_MODES|PACKAGE_ALLOWED)) == 0); +- // Usually refc and defc are the same, but if they differ, verify them both. +- if (refc != defc) { +- if (!isClassAccessible(refc, lookupClass, allowedModes)) { +- // Note that defc is verified in the switch below. +- return false; +- } +- if ((mods & (ALL_ACCESS_MODES|STATIC)) == (PROTECTED|STATIC) && +- (allowedModes & PROTECTED_OR_PACKAGE_ALLOWED) != 0) { +- // Apply the special rules for refc here. +- if (!isRelatedClass(refc, lookupClass)) +- return isSamePackage(defc, lookupClass); +- // If refc == defc, the call to isPublicSuperClass will do +- // the whole job, since in that case refc (as defc) will be +- // a superclass of the lookup class. +- } ++ // The symbolic reference class (refc) must always be fully verified. ++ if (!isClassAccessible(refc, lookupClass, allowedModes)) { ++ return false; + } ++ // Usually refc and defc are the same, but verify defc also in case they differ. + if (defc == lookupClass && + (allowedModes & PRIVATE) != 0) + return true; // easy check; all self-access is OK + switch (mods & ALL_ACCESS_MODES) { + case PUBLIC: +- if (refc != defc) return true; // already checked above +- return isClassAccessible(refc, lookupClass, allowedModes); ++ return true; // already checked above + case PROTECTED: + if ((allowedModes & PROTECTED_OR_PACKAGE_ALLOWED) != 0 && + isSamePackage(defc, lookupClass)) + return true; ++ if ((allowedModes & PROTECTED) == 0) ++ return false; ++ if ((mods & STATIC) != 0 && ++ !isRelatedClass(refc, lookupClass)) ++ return false; + if ((allowedModes & PROTECTED) != 0 && +- isPublicSuperClass(defc, lookupClass)) ++ isSuperClass(defc, lookupClass)) + return true; + return false; + case PACKAGE_ONLY: // That is, zero. Unmarked member is package-only access. +@@ -139,8 +132,8 @@ + lookupClass.isAssignableFrom(refc)); + } + +- static boolean isPublicSuperClass(Class<?> defc, Class<?> lookupClass) { +- return isPublic(defc.getModifiers()) && defc.isAssignableFrom(lookupClass); ++ static boolean isSuperClass(Class<?> defc, Class<?> lookupClass) { ++ return defc.isAssignableFrom(lookupClass); + } + + /** --- ./jdk/src/share/classes/sun/java2d/Disposer.java 2013-09-06 11:28:34.000000000 -0700 -+++ ./jdk/src/share/classes/sun/java2d/Disposer.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/sun/java2d/Disposer.java 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. @@ -64794,7 +66875,7 @@ pollingQueue = false; } --- ./jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java 2013-09-06 11:28:34.000000000 -0700 -+++ ./jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/sun/java2d/opengl/OGLRenderQueue.java 2014-07-15 23:24:34.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. @@ -64826,7 +66907,7 @@ }); } --- ./jdk/src/share/classes/sun/launcher/resources/launcher_de.properties 2013-09-06 11:28:35.000000000 -0700 -+++ ./jdk/src/share/classes/sun/launcher/resources/launcher_de.properties 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_de.properties 2014-07-15 23:24:34.000000000 -0700 @@ -37,7 +37,7 @@ java.launcher.opt.footer =\ -cp <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n -classpath <Klassensuchpfad von Verzeichnissen und ZIP-/JAR-Dateien>\n Eine durch {0} getrennte Liste mit Verzeichnissen, JAR-Archiven\n und ZIP-Archiven zur Suche nach Klassendateien.\n -D<name>=<value>\n Legt eine Systemeigenschaft fest\n -verbose:[class|gc|jni]\n Aktiviert die Verbose-Ausgabe\n -version Druckt Produktversion und beendet das Programm\n -version:<value>\n Erfordert die angegebene Version zur Ausf\u00FChrung\n -showversion Druckt Produktversion und f\u00E4hrt fort\n -jre-restrict-search | -no-jre-restrict-search\n Bezieht private JREs des Benutzers in Versionssuche ein bzw. schlie\u00DFt sie aus\n -? -help Druckt diese Hilfemeldung\n -X Druckt Hilfe zu Nicht-Standardoptionen\n -ea[:<packagename>...|:<classname>]\n -enableassertions[:<packagename>...|:<classname>]\n Aktiviert Assertionen mit angegebener Granularit\u00E4t\n -da[:<packagename>...|:<classname>]\n -disableassertions[:<packagename>...|:<classname>]\n Deaktiviert Assertionen mit angegebener Granularit\u00E4t\n -esa | -enablesystemassertions\n Aktiviert Systemassertionen\n -dsa | -disablesystemassertions\n Deaktiviert Systemassertionen\n -agentlib:<libname>[=<options>]\n L\u00E4dt native Agent Library <libname>, z.B. -agentlib:hprof\n siehe auch -agentlib:jdwp=help und -agentlib:hprof=help\n -agentpath:<pathname>[=<options>]\n L\u00E4dt native Agent Library nach vollem Pfadnamen\n -javaagent:<jarpath>[=<options>]\n L\u00E4dt Java-Programmiersprachen-Agent, siehe java.lang.instrument\n -splash:<imagepath>\n Zeigt Startbildschirm mit angegebenem Bild\nWeitere Einzelheiten finden Sie unter http://www.oracle.com/technetwork/java/javase/documentation/index.html @@ -64837,7 +66918,7 @@ # Translators please note do not translate the options themselves java.launcher.X.macosx.usage=\nDie folgenden Optionen sind f\u00FCr Mac OS X spezifisch:\n -XstartOnFirstThread\n f\u00FChrt die main()-Methode f\u00FCr den ersten (AppKit) Thread aus\n -Xdock:name=<Anwendungsname>"\n \u00DCberschreibt den in der Uhr angezeigten Standardanwendungsnamen\n -Xdock:icon=<Pfad zu Symboldatei>\n \u00DCberschreibt das in der Uhr angezeigte Standardsymbol\n\n --- ./jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties 2013-09-06 11:28:35.000000000 -0700 -+++ ./jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_fr.properties 2014-07-15 23:24:34.000000000 -0700 @@ -34,7 +34,7 @@ java.launcher.ergo.message2 =\ car vous ex\u00E9cutez une machine de classe de serveur.\n @@ -64848,7 +66929,7 @@ # Translators please note do not translate the options themselves java.launcher.X.usage=\ -Xmixed ex\u00E9cution en mode mixte (valeur par d\u00E9faut)\n -Xint ex\u00E9cution en mode interpr\u00E9t\u00E9 uniquement\n -Xbootclasspath:<directories and zip/jar files separated by {0}>\n d\u00E9finition du chemin de recherche pour les ressources et classes bootstrap\n -Xbootclasspath/a:<directories and zip/jar files separated by {0}>\n ajout \u00E0 la fin du chemin de classe bootstrap\n -Xbootclasspath/p:<directories and zip/jar files separated by {0}>\n ajout au d\u00E9but du chemin de classe bootstrap\n -Xdiag affichage de messages de diagnostic suppl\u00E9mentaires\n -Xnoclassgc d\u00E9sactivation de l''op\u00E9ration de ramasse-miette (garbage collection) de la classe\n -Xincgc activation de l''op\u00E9ration de ramasse-miette (garbage collection) incr\u00E9mentielle\n -Xloggc:<file> journalisation du statut de l''op\u00E9ration de ramasse-miette (garbage collection) dans un fichier avec horodatages\n -Xbatch d\u00E9sactivation de la compilation en arri\u00E8re-plan\n -Xms<size> d\u00E9finition de la taille initiale des portions de m\u00E9moire Java\n -Xmx<size> d\u00E9finition de la taille maximale des portions de m\u00E9moire Java\n -Xss<size> d\u00E9finition de la taille de pile de thread Java\n -Xprof sortie des donn\u00E9es de profilage de l''unit\u00E9 centrale\n -Xfuture activation des contr\u00F4les les plus stricts en vue d''anticiper la future valeur par d\u00E9faut\n -Xrs r\u00E9duction de l''utilisation des signaux OS par Java/la machine virtuelle (voir documentation)\n -Xcheck:jni ex\u00E9cution de contr\u00F4les suppl\u00E9mentaires pour les fonctions JNI\n -Xshare:off aucune tentative d''utilisation des donn\u00E9es de classe partag\u00E9es\n -Xshare:auto utilisation des donn\u00E9es de classe partag\u00E9es si possible (valeur par d\u00E9faut)\n -Xshare:on utilisation des donn\u00E9es de classe partag\u00E9es obligatoire ou \u00E9chec de l''op\u00E9ration\n -XshowSettings affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n -XshowSettings:all\n affichage de tous les param\u00E8tres et poursuite de l''op\u00E9ration\n -XshowSettings:vm affichage de tous les param\u00E8tres de machine virtuelle et poursuite de l''op\u00E9ration\n -XshowSettings:properties\n affichage de tous les param\u00E8tres de propri\u00E9t\u00E9 et poursuite de l''op\u00E9ration\n -XshowSettings:locale\n affichage de tous les param\u00E8tres d''environnement local et poursuite de l''op\u00E9ration\n\nLes options -X ne sont pas des options standard et peuvent faire l''objet de modifications sans pr\u00E9avis.\n --- ./jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties 2013-09-06 11:28:35.000000000 -0700 -+++ ./jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_ja.properties 2014-07-15 23:24:34.000000000 -0700 @@ -34,11 +34,11 @@ java.launcher.ergo.message2 =\ \u3053\u308C\u306F\u30B5\u30FC\u30D0\u30FC\u30AF\u30E9\u30B9\u306E\u30DE\u30B7\u30F3\u3067\u5B9F\u884C\u3057\u3066\u3044\u308B\u305F\u3081\u3067\u3059\u3002\n @@ -64865,7 +66946,7 @@ # Translators please note do not translate the options themselves java.launcher.X.macosx.usage=\n\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u306FMac OS X\u56FA\u6709\u3067\u3059\u3002\n -XstartOnFirstThread\n main()\u30E1\u30BD\u30C3\u30C9\u3092\u6700\u521D(AppKit)\u306E\u30B9\u30EC\u30C3\u30C9\u3067\u5B9F\u884C\u3059\u308B\n -Xdock:name=<application name>"\n Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u540D\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n -Xdock:icon=<path to icon file>\n Dock\u306B\u8868\u793A\u3055\u308C\u308B\u30C7\u30D5\u30A9\u30EB\u30C8\u30FB\u30A2\u30A4\u30B3\u30F3\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B\n\n --- ./jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties 2013-09-06 11:28:35.000000000 -0700 -+++ ./jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_ko.properties 2014-07-15 23:24:34.000000000 -0700 @@ -34,10 +34,11 @@ java.launcher.ergo.message2 =\ \uC11C\uBC84\uAE09 \uC2DC\uC2A4\uD15C\uC5D0\uC11C \uC2E4\uD589 \uC911\uC774\uAE30 \uB54C\uBB38\uC785\uB2C8\uB2E4.\n @@ -64881,7 +66962,7 @@ # Translators please note do not translate the options themselves java.launcher.X.macosx.usage=\n\uB2E4\uC74C\uC740 Mac OS X\uC5D0 \uD2B9\uC815\uB41C \uC635\uC158\uC785\uB2C8\uB2E4.\n -XstartOnFirstThread\n \uCCAB\uBC88\uC9F8 (AppKit) \uC2A4\uB808\uB4DC\uC5D0 main() \uBA54\uC18C\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4.\n -Xdock:name=<application name>"\n \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC774\uB984\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n -Xdock:icon=<path to icon file>\n \uACE0\uC815\uC73C\uB85C \uD45C\uC2DC\uB41C \uAE30\uBCF8 \uC544\uC774\uCF58\uC744 \uBB34\uD6A8\uD654\uD569\uB2C8\uB2E4.\n\n --- ./jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties 2013-09-06 11:28:35.000000000 -0700 -+++ ./jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/launcher/resources/launcher_pt_BR.properties 2014-07-15 23:24:34.000000000 -0700 @@ -30,17 +30,17 @@ java.launcher.opt.vmselect =\ {0}\t para selecionar a VM "{1}"\n java.launcher.opt.hotspot =\ {0}\t \u00E9 um sin\u00F4nimo da VM "{1}" [obsoleto]\n @@ -64905,7 +66986,7 @@ java.launcher.cls.error1=Erro: N\u00E3o foi poss\u00EDvel localizar nem carregar a classe principal {0} java.launcher.cls.error2=Erro: o m\u00E9todo main n\u00E3o \u00E9 {0} na classe {1}; defina o m\u00E9todo main como:\n public static void main(String[] args) --- ./jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2013-09-06 11:28:35.000000000 -0700 -+++ ./jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2013-12-01 11:14:34.000000000 -0800 ++++ ./jdk/src/share/classes/sun/management/HotSpotDiagnostic.java 2014-07-15 23:24:34.000000000 -0700 @@ -40,7 +40,17 @@ public HotSpotDiagnostic() { } @@ -64926,7 +67007,7 @@ public List<VMOption> getDiagnosticOptions() { List<Flag> allFlags = Flag.getAllFlags(); --- ./jdk/src/share/classes/sun/management/resources/agent_ja.properties 2013-09-06 11:28:36.000000000 -0700 -+++ ./jdk/src/share/classes/sun/management/resources/agent_ja.properties 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/management/resources/agent_ja.properties 2014-07-15 23:24:34.000000000 -0700 @@ -36,7 +36,7 @@ agent.err.configfile.closed.failed = \u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u3092\u9589\u3058\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F agent.err.configfile.access.denied = \u69CB\u6210\u30D5\u30A1\u30A4\u30EB\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u304C\u62D2\u5426\u3055\u308C\u307E\u3057\u305F @@ -64937,7 +67018,7 @@ agent.err.agentclass.notfound = \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093 agent.err.agentclass.failed = \u7BA1\u7406\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u30FB\u30AF\u30E9\u30B9\u304C\u5931\u6557\u3057\u307E\u3057\u305F --- ./jdk/src/share/classes/sun/misc/FloatingDecimal.java 2013-09-06 11:28:37.000000000 -0700 -+++ ./jdk/src/share/classes/sun/misc/FloatingDecimal.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/misc/FloatingDecimal.java 2014-07-15 23:24:34.000000000 -0700 @@ -70,6 +70,15 @@ static final int minDecimalExponent = -324; static final int bigDecimalExponent = 324; // i.e. abs(minDecimalExponent) @@ -64966,7 +67047,7 @@ exp = decExponent - nDigits; --- ./jdk/src/share/classes/sun/misc/InnocuousThread.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/classes/sun/misc/InnocuousThread.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/sun/misc/InnocuousThread.java 2014-07-15 23:24:34.000000000 -0700 @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -65090,7 +67171,7 @@ + } +} --- ./jdk/src/share/classes/sun/misc/JavaAWTAccess.java 2013-09-06 11:28:37.000000000 -0700 -+++ ./jdk/src/share/classes/sun/misc/JavaAWTAccess.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/share/classes/sun/misc/JavaAWTAccess.java 2014-07-15 23:24:34.000000000 -0700 @@ -26,14 +26,16 @@ package sun.misc; @@ -65115,7 +67196,7 @@ public void put(Object key, Object value); public void remove(Object key); --- ./jdk/src/share/classes/sun/misc/JavaLangAccess.java 2013-09-06 11:28:37.000000000 -0700 -+++ ./jdk/src/share/classes/sun/misc/JavaLangAccess.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/misc/JavaLangAccess.java 2014-07-15 23:24:34.000000000 -0700 @@ -25,6 +25,7 @@ package sun.misc; @@ -65141,7 +67222,7 @@ + void invokeFinalize(Object o) throws Throwable; } --- ./jdk/src/share/classes/sun/misc/Service.java 2013-09-06 11:28:37.000000000 -0700 -+++ ./jdk/src/share/classes/sun/misc/Service.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/misc/Service.java 2014-07-15 23:24:34.000000000 -0700 @@ -299,7 +299,7 @@ return service.cast(c.newInstance()); } catch (Throwable x) { @@ -65152,7 +67233,7 @@ } return null; /* This cannot happen */ --- ./jdk/src/share/classes/sun/misc/SharedSecrets.java 2013-09-06 11:28:37.000000000 -0700 -+++ ./jdk/src/share/classes/sun/misc/SharedSecrets.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/misc/SharedSecrets.java 2014-07-15 23:24:34.000000000 -0700 @@ -197,9 +197,6 @@ public static JavaAWTAccess getJavaAWTAccess() { // this may return null in which case calling code needs to @@ -65164,7 +67245,7 @@ } } --- ./jdk/src/share/classes/sun/misc/ThreadGroupUtils.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/classes/sun/misc/ThreadGroupUtils.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/misc/ThreadGroupUtils.java 2014-07-15 23:24:34.000000000 -0700 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -65222,7 +67303,7 @@ + } +} --- ./jdk/src/share/classes/sun/misc/VM.java 2013-09-06 11:28:37.000000000 -0700 -+++ ./jdk/src/share/classes/sun/misc/VM.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/misc/VM.java 2014-07-15 23:24:34.000000000 -0700 @@ -147,6 +147,7 @@ @@ -65261,7 +67342,7 @@ // buffer memory. This value may be changed during VM initialization if // "java" is launched with "-XX:MaxDirectMemorySize=<size>". --- ./jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java 2013-09-06 11:28:38.000000000 -0700 -+++ ./jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java 2014-07-15 23:24:34.000000000 -0700 @@ -428,6 +428,10 @@ throw new AlreadyBoundException(); InetSocketAddress isa = (local == null) ? @@ -65274,7 +67355,7 @@ Net.bind(fd, isa.getAddress(), isa.getPort()); localAddress = Net.localAddress(fd); --- ./jdk/src/share/classes/sun/nio/ch/Invoker.java 2013-09-06 11:28:39.000000000 -0700 -+++ ./jdk/src/share/classes/sun/nio/ch/Invoker.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/nio/ch/Invoker.java 2014-07-15 23:24:34.000000000 -0700 @@ -130,6 +130,18 @@ // clear interrupt @@ -65295,7 +67376,7 @@ /** --- ./jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java 2013-09-06 11:28:39.000000000 -0700 -+++ ./jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/src/share/classes/sun/nio/ch/SocketChannelImpl.java 2014-07-15 23:24:34.000000000 -0700 @@ -599,6 +599,10 @@ throw new AlreadyBoundException(); InetSocketAddress isa = (local == null) ? @@ -65308,7 +67389,7 @@ Net.bind(fd, isa.getAddress(), isa.getPort()); localAddress = Net.localAddress(fd); --- ./jdk/src/share/classes/sun/nio/ch/ThreadPool.java 2013-09-06 11:28:39.000000000 -0700 -+++ ./jdk/src/share/classes/sun/nio/ch/ThreadPool.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/nio/ch/ThreadPool.java 2014-07-15 23:24:34.000000000 -0700 @@ -27,6 +27,7 @@ import java.util.concurrent.*; @@ -65373,7 +67454,7 @@ ExecutorService executor = new ThreadPoolExecutor(0, Integer.MAX_VALUE, --- ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java 2013-09-06 11:28:39.000000000 -0700 -+++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java 2013-12-01 11:14:35.000000000 -0800 ++++ ./jdk/src/share/classes/sun/nio/cs/ext/ExtendedCharsets.java 2014-07-15 23:24:34.000000000 -0700 @@ -1031,6 +1031,24 @@ "ebcdic-s-871+euro" }); @@ -65400,7 +67481,7 @@ --- ./jdk/src/share/classes/sun/nio/cs/ext/IBM300.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/classes/sun/nio/cs/ext/IBM300.java 2013-12-01 11:14:35.000000000 -0800 ++++ ./jdk/src/share/classes/sun/nio/cs/ext/IBM300.java 2014-07-15 23:24:36.000000000 -0700 @@ -0,0 +1,1875 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -67283,7 +69364,7 @@ -# NIO charset SPI extended charset provider -sun.nio.cs.ext.ExtendedCharsets --- ./jdk/src/share/classes/sun/print/DocumentPropertiesUI.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/classes/sun/print/DocumentPropertiesUI.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/print/DocumentPropertiesUI.java 2014-07-15 23:24:36.000000000 -0700 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -67348,7 +69429,7 @@ + +} --- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2013-09-06 11:28:40.000000000 -0700 -+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2014-07-15 23:24:36.000000000 -0700 @@ -1568,7 +1568,7 @@ } @@ -67359,7 +69440,7 @@ execCmd[n++] = "/usr/bin/lpr"; if ((pFlags & PRINTER) != 0) { --- ./jdk/src/share/classes/sun/print/PrinterJobWrapper.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/share/classes/sun/print/PrinterJobWrapper.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/print/PrinterJobWrapper.java 2014-07-15 23:24:36.000000000 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -67422,7 +69503,7 @@ + } +} --- ./jdk/src/share/classes/sun/print/RasterPrinterJob.java 2013-09-06 11:28:40.000000000 -0700 -+++ ./jdk/src/share/classes/sun/print/RasterPrinterJob.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/print/RasterPrinterJob.java 2014-07-15 23:24:36.000000000 -0700 @@ -879,6 +879,9 @@ int x = bounds.x+bounds.width/3; int y = bounds.y+bounds.height/3; @@ -67442,7 +69523,7 @@ if (newService == null) { return false; --- ./jdk/src/share/classes/sun/print/ServiceDialog.java 2013-09-06 11:28:40.000000000 -0700 -+++ ./jdk/src/share/classes/sun/print/ServiceDialog.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/print/ServiceDialog.java 2014-07-15 23:24:36.000000000 -0700 @@ -46,6 +46,7 @@ import java.awt.event.ItemListener; import java.awt.event.WindowEvent; @@ -67497,7 +69578,7 @@ } } --- ./jdk/src/share/classes/sun/print/resources/serviceui_es.properties 2013-09-06 11:28:40.000000000 -0700 -+++ ./jdk/src/share/classes/sun/print/resources/serviceui_es.properties 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/src/share/classes/sun/print/resources/serviceui_es.properties 2014-07-15 23:24:36.000000000 -0700 @@ -36,29 +36,29 @@ label.pstype=Tipo: label.rangeto=A @@ -67535,7 +69616,7 @@ # The vkMnemonics correspond with the constants defined in KeyEvent, eg # 65 = KeyEvent.VK_A --- ./jdk/src/share/classes/sun/print/resources/serviceui_fr.properties 2013-09-06 11:28:40.000000000 -0700 -+++ ./jdk/src/share/classes/sun/print/resources/serviceui_fr.properties 2014-01-18 12:16:25.000000000 -0800 ++++ ./jdk/src/share/classes/sun/print/resources/serviceui_fr.properties 2014-07-15 23:24:36.000000000 -0700 @@ -29,7 +29,7 @@ dialog.writeerror=Impossible d'\u00E9crire dans le fichier : # @@ -67584,7 +69665,7 @@ error.pagerange=Plage de pages non valide. Sp\u00E9cifiez les valeurs de nouveau (ex. : 1-3,5,7-10) error.destination=Nom de fichier non valide ; recommencez --- ./jdk/src/share/classes/sun/print/resources/serviceui_it.properties 2013-09-06 11:28:40.000000000 -0700 -+++ ./jdk/src/share/classes/sun/print/resources/serviceui_it.properties 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/src/share/classes/sun/print/resources/serviceui_it.properties 2014-07-15 23:24:36.000000000 -0700 @@ -47,8 +47,8 @@ label.rightmargin=&destro # @@ -67606,7 +69687,7 @@ tab.pagesetup=Impo&sta pagina # --- ./jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties 2013-09-06 11:28:40.000000000 -0700 -+++ ./jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/src/share/classes/sun/print/resources/serviceui_pt_BR.properties 2014-07-15 23:24:36.000000000 -0700 @@ -31,7 +31,7 @@ label.info=Informa\u00E7\u00F5es: label.jobname=Nome do &Job: @@ -67655,7 +69736,7 @@ error.pagerange=Faixa de p\u00E1ginas inv\u00E1lida; insira novamente os valores (por exemplo, 1-3,5,7-10) error.destination=Nome de arquivo inv\u00E1lido; tente novamente --- ./jdk/src/share/classes/sun/print/resources/serviceui_sv.properties 2013-09-06 11:28:40.000000000 -0700 -+++ ./jdk/src/share/classes/sun/print/resources/serviceui_sv.properties 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/src/share/classes/sun/print/resources/serviceui_sv.properties 2014-07-15 23:24:36.000000000 -0700 @@ -17,7 +17,7 @@ button.properties=&Egenskaper... # @@ -67703,7 +69784,7 @@ error.pagerange=Ogiltigt sidintervall. Skriv in v\u00E4rdena igen (t ex 1-3,5,7-10) error.destination=Ogiltigt filnamn. F\u00F6rs\u00F6k igen. --- ./jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java 2013-09-06 11:28:41.000000000 -0700 -+++ ./jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java 2014-07-15 23:24:36.000000000 -0700 @@ -25,13 +25,17 @@ package sun.reflect.generics.reflectiveObjects; @@ -67761,7 +69842,7 @@ GenericDeclaration thatDecl = that.getGenericDeclaration(); --- ./jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java 2013-09-06 11:28:41.000000000 -0700 -+++ ./jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/src/share/classes/sun/reflect/misc/ReflectUtil.java 2014-07-15 23:24:36.000000000 -0700 @@ -26,9 +26,13 @@ package sun.reflect.misc; @@ -67868,7 +69949,7 @@ + } } --- ./jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2013-09-06 11:28:41.000000000 -0700 -+++ ./jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2014-07-15 23:24:36.000000000 -0700 @@ -352,7 +352,7 @@ public RegistryImpl run() throws RemoteException { return new RegistryImpl(regPort); @@ -67896,7 +69977,7 @@ perms.add(new RuntimePermission("accessClassInPackage.sun.jvmstat.*")); perms.add(new RuntimePermission("accessClassInPackage.sun.jvm.hotspot.*")); --- ./jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties 2013-09-06 11:28:42.000000000 -0700 -+++ ./jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/src/share/classes/sun/rmi/server/resources/rmid_ko.properties 2014-07-15 23:24:36.000000000 -0700 @@ -87,7 +87,7 @@ rmid.restart.service.warning=\nrmid: (\uACBD\uACE0) \uC11C\uBE44\uC2A4 \uC7AC\uC2DC\uC791\uC73C\uB85C \uC778\uD574 \uBC1C\uC0DD\uD55C \uC624\uB958: @@ -67906,8 +69987,60 @@ # "rmid" should not be translated rmid.log.snapshot.warning=\nrmid: (\uC2EC\uAC01) \uB85C\uADF8 \uC2A4\uB0C5\uC0F7\uC73C\uB85C \uC778\uD574 \uBC1C\uC0DD\uD55C \uC624\uB958: +--- ./jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java 2013-09-06 11:28:42.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/ec/ECKeyPairGenerator.java 2014-07-15 23:24:36.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2009, 2014, 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 +@@ -123,19 +123,19 @@ + + try { + +- long[] handles = generateECKeyPair(keySize, encodedParams, seed); ++ Object[] keyBytes = generateECKeyPair(keySize, encodedParams, seed); + + // The 'params' object supplied above is equivalent to the native + // one so there is no need to fetch it. + +- // handles[0] points to the native private key +- BigInteger s = new BigInteger(1, getEncodedBytes(handles[0])); ++ // keyBytes[0] is the encoding of the native private key ++ BigInteger s = new BigInteger(1, (byte[])keyBytes[0]); + + PrivateKey privateKey = + new ECPrivateKeyImpl(s, (ECParameterSpec)params); + +- // handles[1] points to the native public key +- ECPoint w = ECParameters.decodePoint(getEncodedBytes(handles[1]), ++ // keyBytes[1] is the encoding of the native public key ++ ECPoint w = ECParameters.decodePoint((byte[])keyBytes[1], + ((ECParameterSpec)params).getCurve()); + PublicKey publicKey = + new ECPublicKeyImpl(w, (ECParameterSpec)params); +@@ -160,14 +160,9 @@ + } + + /* +- * Generates the keypair and returns a 2-element array of handles. +- * The first handle points to the private key, the second to the public key. ++ * Generates the keypair and returns a 2-element array of encoding bytes. ++ * The first one is for the private key, the second for the public key. + */ +- private static native long[] generateECKeyPair(int keySize, ++ private static native Object[] generateECKeyPair(int keySize, + byte[] encodedParams, byte[] seed) throws GeneralSecurityException; +- +- /* +- * Extracts the encoded key data using the supplied handle. +- */ +- private static native byte[] getEncodedBytes(long handle); + } --- ./jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java 2013-09-06 11:28:42.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java 2013-12-01 11:14:35.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/ec/ECPrivateKeyImpl.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -67929,7 +70062,7 @@ - } --- ./jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java 2013-09-06 11:28:42.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. @@ -68011,7 +70144,7 @@ + } } --- ./jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java 2013-09-06 11:28:42.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java 2013-12-01 11:14:35.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/jgss/GSSCredentialImpl.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved. @@ -68029,7 +70162,7 @@ } catch (GSSException e) { // skip to next element --- ./jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java 2013-09-06 11:28:43.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/jgss/spnego/SpNegoContext.java 2014-07-15 23:24:36.000000000 -0700 @@ -525,6 +525,10 @@ // get the mechanism token @@ -68042,7 +70175,7 @@ /* * Select the best match between the list of mechs --- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2013-09-06 11:28:43.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2014-07-15 23:24:36.000000000 -0700 @@ -83,7 +83,8 @@ String osname = System.getProperty("os.name"); if (osname.startsWith("SunOS")) { @@ -68054,7 +70187,7 @@ "libgssapi.so", "libgssapi_krb5.so", --- ./jdk/src/share/classes/sun/security/krb5/Credentials.java 2013-09-06 11:28:43.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/krb5/Credentials.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/krb5/Credentials.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. @@ -68099,7 +70232,7 @@ } return result; --- ./jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-09-06 11:28:43.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/krb5/KdcComm.java 2013-12-01 11:14:36.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/krb5/KdcComm.java 2014-07-15 23:24:36.000000000 -0700 @@ -239,11 +239,15 @@ savedException = e; } @@ -68121,7 +70254,7 @@ } return ibuf; --- ./jdk/src/share/classes/sun/security/krb5/Realm.java 2013-09-06 11:28:43.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/krb5/Realm.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/krb5/Realm.java 2014-07-15 23:24:36.000000000 -0700 @@ -34,6 +34,7 @@ import sun.security.krb5.internal.Krb5; import sun.security.util.*; @@ -68599,7 +70732,7 @@ - } --- ./jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java 2013-09-06 11:28:43.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/krb5/internal/CredentialsUtil.java 2014-07-15 23:24:36.000000000 -0700 @@ -155,13 +155,11 @@ } @@ -68618,7 +70751,7 @@ tempService = new ServiceName( --- ./jdk/src/share/classes/sun/security/krb5/internal/NetClient.java 2013-09-06 11:28:43.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/krb5/internal/NetClient.java 2013-12-01 11:14:36.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/krb5/internal/NetClient.java 2014-07-15 23:24:36.000000000 -0700 @@ -31,6 +31,8 @@ package sun.security.krb5.internal; @@ -68650,7 +70783,7 @@ } --- ./jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java 2013-09-06 11:28:44.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java 2013-12-01 11:14:36.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/pkcs/PKCS8Key.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved. @@ -68677,7 +70810,7 @@ * Initialize an PKCS8Key object from an input stream. The data * on that input stream must be encoded using DER, obeying the --- ./jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2013-09-06 11:28:44.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2013-12-01 11:14:36.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/pkcs11/P11Key.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. @@ -68767,7 +70900,7 @@ private static final class P11ECPublicKey extends P11Key --- ./jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java 2013-09-06 11:28:44.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/pkcs11/P11KeyAgreement.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. @@ -68785,7 +70918,7 @@ key = new SecretKeySpec(newBytes, algorithm); } --- ./jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java 2013-09-06 11:28:44.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java 2014-01-18 12:16:26.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/pkcs11/P11RSACipher.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. @@ -68826,7 +70959,7 @@ implInit(Cipher.DECRYPT_MODE, p11Key); if (wrappedKey.length > maxInputSize) { --- ./jdk/src/share/classes/sun/security/pkcs11/P11Signature.java 2013-09-06 11:28:44.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/pkcs11/P11Signature.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/pkcs11/P11Signature.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. @@ -68854,7 +70987,7 @@ // r and s each occupy half the array byte[] res = new byte[k << 1]; --- ./jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java 2013-09-06 11:28:44.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. @@ -68913,7 +71046,7 @@ } --- ./jdk/src/share/classes/sun/security/pkcs11/P11Util.java 2013-09-06 11:28:44.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/pkcs11/P11Util.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/pkcs11/P11Util.java 2014-07-15 23:24:36.000000000 -0700 @@ -131,20 +131,6 @@ return b; } @@ -68936,7 +71069,7 @@ byte[] b = bi.toByteArray(); if ((b.length > 1) && (b[0] == 0)) { --- ./jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java 2013-09-06 11:28:44.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/provider/ByteArrayAccess.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. @@ -69083,7 +71216,7 @@ - } --- ./jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java 2013-09-06 11:28:44.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java 2013-12-01 11:14:36.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/provider/DSAPrivateKey.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2002, Oracle and/or its affiliates. All rights reserved. @@ -69104,7 +71237,7 @@ try { DerInputStream in = new DerInputStream(key); --- ./jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2013-09-06 11:28:44.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/provider/SeedGenerator.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. @@ -69156,7 +71289,7 @@ * Helper function to convert a long into a byte array (least significant * byte first). --- ./jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/provider/certpath/AlgorithmChecker.java 2014-07-15 23:24:36.000000000 -0700 @@ -75,7 +75,7 @@ private PublicKey prevPubKey; @@ -69167,7 +71300,7 @@ private final static DisabledAlgorithmConstraints certPathDefaultConstraints = new DisabledAlgorithmConstraints( --- ./jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/provider/certpath/ldap/LDAPCertStore.java 2014-07-15 23:24:36.000000000 -0700 @@ -50,6 +50,7 @@ import sun.security.util.Cache; import sun.security.util.Debug; @@ -69209,8 +71342,408 @@ try { ctx = new InitialDirContext(env); /* +--- ./jdk/src/share/classes/sun/security/rsa/RSACore.java 2013-09-06 11:28:45.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/rsa/RSACore.java 2014-07-15 23:24:36.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2003, 2014, 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 +@@ -50,6 +50,15 @@ + */ + public final class RSACore { + ++ // globally enable/disable use of blinding ++ private final static boolean ENABLE_BLINDING = true; ++ ++ // cache for blinding parameters. Map<BigInteger, BlindingParameters> ++ // use a weak hashmap so that cached values are automatically cleared ++ // when the modulus is GC'ed ++ private final static Map<BigInteger, BlindingParameters> ++ blindingCache = new WeakHashMap<>(); ++ + private RSACore() { + // empty + } +@@ -100,12 +109,12 @@ + if (key instanceof RSAPrivateCrtKey) { + return crtCrypt(msg, (RSAPrivateCrtKey)key); + } else { +- return crypt(msg, key.getModulus(), key.getPrivateExponent()); ++ return priCrypt(msg, key.getModulus(), key.getPrivateExponent()); + } + } + + /** +- * RSA public key ops and non-CRT private key ops. Simple modPow(). ++ * RSA public key ops. Simple modPow(). + */ + private static byte[] crypt(byte[] msg, BigInteger n, BigInteger exp) + throws BadPaddingException { +@@ -115,22 +124,29 @@ + } + + /** ++ * RSA non-CRT private key operations. ++ */ ++ private static byte[] priCrypt(byte[] msg, BigInteger n, BigInteger exp) ++ throws BadPaddingException { ++ ++ BigInteger c = parseMsg(msg, n); ++ BlindingRandomPair brp = null; ++ BigInteger m; ++ if (ENABLE_BLINDING) { ++ brp = getBlindingRandomPair(null, exp, n); ++ c = c.multiply(brp.u).mod(n); ++ m = c.modPow(exp, n); ++ m = m.multiply(brp.v).mod(n); ++ } else { ++ m = c.modPow(exp, n); ++ } ++ ++ return toByteArray(m, getByteLength(n)); ++ } ++ ++ /** + * RSA private key operations with CRT. Algorithm and variable naming + * are taken from PKCS#1 v2.1, section 5.1.2. +- * +- * The only difference is the addition of blinding to twart timing attacks. +- * This is described in the RSA Bulletin#2 (Jan 96) among other places. +- * This means instead of implementing RSA as +- * m = c ^ d mod n (or RSA in CRT variant) +- * we do +- * r = random(0, n-1) +- * c' = c * r^e mod n +- * m' = c' ^ d mod n (or RSA in CRT variant) +- * m = m' * r^-1 mod n (where r^-1 is the modular inverse of r mod n) +- * This works because r^(e*d) * r^-1 = r * r^-1 = 1 (all mod n) +- * +- * We do not generate new blinding parameters for each operation but reuse +- * them BLINDING_MAX_REUSE times (see definition below). + */ + private static byte[] crtCrypt(byte[] msg, RSAPrivateCrtKey key) + throws BadPaddingException { +@@ -141,13 +157,13 @@ + BigInteger dP = key.getPrimeExponentP(); + BigInteger dQ = key.getPrimeExponentQ(); + BigInteger qInv = key.getCrtCoefficient(); ++ BigInteger e = key.getPublicExponent(); ++ BigInteger d = key.getPrivateExponent(); + +- BlindingParameters params; ++ BlindingRandomPair brp; + if (ENABLE_BLINDING) { +- params = getBlindingParameters(key); +- c = c.multiply(params.re).mod(n); +- } else { +- params = null; ++ brp = getBlindingRandomPair(e, d, n); ++ c = c.multiply(brp.u).mod(n); + } + + // m1 = c ^ dP mod p +@@ -165,8 +181,8 @@ + // m = m2 + q * h + BigInteger m = h.multiply(q).add(m2); + +- if (params != null) { +- m = m.multiply(params.rInv).mod(n); ++ if (ENABLE_BLINDING) { ++ m = m.multiply(brp.v).mod(n); + } + + return toByteArray(m, getByteLength(n)); +@@ -208,82 +224,221 @@ + return t; + } + +- // globally enable/disable use of blinding +- private final static boolean ENABLE_BLINDING = true; +- +- // maximum number of times that we will use a set of blinding parameters +- // value suggested by Paul Kocher (quoted by NSS) +- private final static int BLINDING_MAX_REUSE = 50; +- +- // cache for blinding parameters. Map<BigInteger, BlindingParameters> +- // use a weak hashmap so that cached values are automatically cleared +- // when the modulus is GC'ed +- private final static Map<BigInteger, BlindingParameters> blindingCache = +- new WeakHashMap<>(); ++ /** ++ * Parameters (u,v) for RSA Blinding. This is described in the RSA ++ * Bulletin#2 (Jan 96) and other places: ++ * ++ * ftp://ftp.rsa.com/pub/pdfs/bull-2.pdf ++ * ++ * The standard RSA Blinding decryption requires the public key exponent ++ * (e) and modulus (n), and converts ciphertext (c) to plaintext (p). ++ * ++ * Before the modular exponentiation operation, the input message should ++ * be multiplied by (u (mod n)), and afterward the result is corrected ++ * by multiplying with (v (mod n)). The system should reject messages ++ * equal to (0 (mod n)). That is: ++ * ++ * 1. Generate r between 0 and n-1, relatively prime to n. ++ * 2. Compute x = (c*u) mod n ++ * 3. Compute y = (x^d) mod n ++ * 4. Compute p = (y*v) mod n ++ * ++ * The Java APIs allows for either standard RSAPrivateKey or ++ * RSAPrivateCrtKey RSA keys. ++ * ++ * If the public exponent is available to us (e.g. RSAPrivateCrtKey), ++ * choose a random r, then let (u, v): ++ * ++ * u = r ^ e mod n ++ * v = r ^ (-1) mod n ++ * ++ * The proof follows: ++ * ++ * p = (((c * u) ^ d mod n) * v) mod n ++ * = ((c ^ d) * (u ^ d) * v) mod n ++ * = ((c ^ d) * (r ^ e) ^ d) * (r ^ (-1))) mod n ++ * = ((c ^ d) * (r ^ (e * d)) * (r ^ (-1))) mod n ++ * = ((c ^ d) * (r ^ 1) * (r ^ (-1))) mod n (see below) ++ * = (c ^ d) mod n ++ * ++ * because in RSA cryptosystem, d is the multiplicative inverse of e: ++ * ++ * (r^(e * d)) mod n ++ * = (r ^ 1) mod n ++ * = r mod n ++ * ++ * However, if the public exponent is not available (e.g. RSAPrivateKey), ++ * we mitigate the timing issue by using a similar random number blinding ++ * approach using the private key: ++ * ++ * u = r ++ * v = ((r ^ (-1)) ^ d) mod n ++ * ++ * This returns the same plaintext because: ++ * ++ * p = (((c * u) ^ d mod n) * v) mod n ++ * = ((c ^ d) * (u ^ d) * v) mod n ++ * = ((c ^ d) * (u ^ d) * ((u ^ (-1)) ^d)) mod n ++ * = (c ^ d) mod n ++ * ++ * Computing inverses mod n and random number generation is slow, so ++ * it is often not practical to generate a new random (u, v) pair for ++ * each new exponentiation. The calculation of parameters might even be ++ * subject to timing attacks. However, (u, v) pairs should not be ++ * reused since they themselves might be compromised by timing attacks, ++ * leaving the private exponent vulnerable. An efficient solution to ++ * this problem is update u and v before each modular exponentiation ++ * step by computing: ++ * ++ * u = u ^ 2 ++ * v = v ^ 2 ++ * ++ * The total performance cost is small. ++ */ ++ private final static class BlindingRandomPair { ++ final BigInteger u; ++ final BigInteger v; ++ ++ BlindingRandomPair(BigInteger u, BigInteger v) { ++ this.u = u; ++ this.v = v; ++ } ++ } + + /** + * Set of blinding parameters for a given RSA key. + * + * The RSA modulus is usually unique, so we index by modulus in +- * blindingCache. However, to protect against the unlikely case of two +- * keys sharing the same modulus, we also store the public exponent. +- * This means we cannot cache blinding parameters for multiple keys that +- * share the same modulus, but since sharing moduli is fundamentally broken +- * an insecure, this does not matter. +- */ +- private static final class BlindingParameters { +- // e (RSA public exponent) +- final BigInteger e; +- // r ^ e mod n +- final BigInteger re; +- // inverse of r mod n +- final BigInteger rInv; +- // how many more times this parameter object can be used +- private volatile int remainingUses; +- BlindingParameters(BigInteger e, BigInteger re, BigInteger rInv) { ++ * {@code blindingCache}. However, to protect against the unlikely ++ * case of two keys sharing the same modulus, we also store the public ++ * or the private exponent. This means we cannot cache blinding ++ * parameters for multiple keys that share the same modulus, but ++ * since sharing moduli is fundamentally broken and insecure, this ++ * does not matter. ++ */ ++ private final static class BlindingParameters { ++ private final static BigInteger BIG_TWO = BigInteger.valueOf(2L); ++ ++ // RSA public exponent ++ private final BigInteger e; ++ ++ // hash code of RSA private exponent ++ private final BigInteger d; ++ ++ // r ^ e mod n (CRT), or r mod n (Non-CRT) ++ private BigInteger u; ++ ++ // r ^ (-1) mod n (CRT) , or ((r ^ (-1)) ^ d) mod n (Non-CRT) ++ private BigInteger v; ++ ++ // e: the public exponent ++ // d: the private exponent ++ // n: the modulus ++ BlindingParameters(BigInteger e, BigInteger d, BigInteger n) { ++ this.u = null; ++ this.v = null; + this.e = e; +- this.re = re; +- this.rInv = rInv; +- // initialize remaining uses, subtract current use now +- remainingUses = BLINDING_MAX_REUSE - 1; +- } +- boolean valid(BigInteger e) { +- int k = remainingUses--; +- return (k > 0) && this.e.equals(e); ++ this.d = d; ++ ++ int len = n.bitLength(); ++ SecureRandom random = JCAUtil.getSecureRandom(); ++ u = new BigInteger(len, random).mod(n); ++ // Although the possibility is very much limited that u is zero ++ // or is not relatively prime to n, we still want to be careful ++ // about the special value. ++ // ++ // Secure random generation is expensive, try to use BigInteger.ONE ++ // this time if this new generated random number is zero or is not ++ // relatively prime to n. Next time, new generated secure random ++ // number will be used instead. ++ if (u.equals(BigInteger.ZERO)) { ++ u = BigInteger.ONE; // use 1 this time ++ } ++ ++ try { ++ // The call to BigInteger.modInverse() checks that u is ++ // relatively prime to n. Otherwise, ArithmeticException is ++ // thrown. ++ v = u.modInverse(n); ++ } catch (ArithmeticException ae) { ++ // if u is not relatively prime to n, use 1 this time ++ u = BigInteger.ONE; ++ v = BigInteger.ONE; ++ } ++ ++ if (e != null) { ++ u = u.modPow(e, n); // e: the public exponent ++ // u: random ^ e ++ // v: random ^ (-1) ++ } else { ++ v = v.modPow(d, n); // d: the private exponent ++ // u: random ++ // v: random ^ (-d) ++ } ++ } ++ ++ // return null if need to reset the parameters ++ BlindingRandomPair getBlindingRandomPair( ++ BigInteger e, BigInteger d, BigInteger n) { ++ ++ if ((this.e != null && this.e.equals(e)) || ++ (this.d != null && this.d.equals(d))) { ++ ++ BlindingRandomPair brp = null; ++ synchronized (this) { ++ if (!u.equals(BigInteger.ZERO) && ++ !v.equals(BigInteger.ZERO)) { ++ ++ brp = new BlindingRandomPair(u, v); ++ if (u.compareTo(BigInteger.ONE) <= 0 || ++ v.compareTo(BigInteger.ONE) <= 0) { ++ ++ // need to reset the random pair next time ++ u = BigInteger.ZERO; ++ v = BigInteger.ZERO; ++ } else { ++ u = u.modPow(BIG_TWO, n); ++ v = v.modPow(BIG_TWO, n); ++ } ++ } // Otherwise, need to reset the random pair. ++ } ++ return brp; ++ } ++ ++ return null; + } + } + +- /** +- * Return valid RSA blinding parameters for the given private key. +- * Use cached parameters if available. If not, generate new parameters +- * and cache. +- */ +- private static BlindingParameters getBlindingParameters +- (RSAPrivateCrtKey key) { +- BigInteger modulus = key.getModulus(); +- BigInteger e = key.getPublicExponent(); +- BlindingParameters params; +- // we release the lock between get() and put() +- // that means threads might concurrently generate new blinding +- // parameters for the same modulus. this is only a slight waste +- // of cycles and seems preferable in terms of scalability +- // to locking out all threads while generating new parameters ++ private static BlindingRandomPair getBlindingRandomPair( ++ BigInteger e, BigInteger d, BigInteger n) { ++ ++ BlindingParameters bps = null; + synchronized (blindingCache) { +- params = blindingCache.get(modulus); ++ bps = blindingCache.get(n); + } +- if ((params != null) && params.valid(e)) { +- return params; +- } +- int len = modulus.bitLength(); +- SecureRandom random = JCAUtil.getSecureRandom(); +- BigInteger r = new BigInteger(len, random).mod(modulus); +- BigInteger re = r.modPow(e, modulus); +- BigInteger rInv = r.modInverse(modulus); +- params = new BlindingParameters(e, re, rInv); +- synchronized (blindingCache) { +- blindingCache.put(modulus, params); ++ ++ if (bps == null) { ++ bps = new BlindingParameters(e, d, n); ++ synchronized (blindingCache) { ++ if (blindingCache.get(n) == null) { ++ blindingCache.put(n, bps); ++ } ++ } ++ } ++ ++ BlindingRandomPair brp = bps.getBlindingRandomPair(e, d, n); ++ if (brp == null) { ++ // need to reset the blinding parameters ++ bps = new BlindingParameters(e, d, n); ++ synchronized (blindingCache) { ++ if (blindingCache.get(n) != null) { ++ blindingCache.put(n, bps); ++ } ++ } ++ brp = bps.getBlindingRandomPair(e, d, n); + } +- return params; ++ ++ return brp; + } + + } --- ./jdk/src/share/classes/sun/security/rsa/RSAPadding.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/rsa/RSAPadding.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/rsa/RSAPadding.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. @@ -69484,7 +72017,7 @@ - } --- ./jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java 2013-12-01 11:14:36.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/rsa/RSAPrivateCrtKeyImpl.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. @@ -69523,7 +72056,7 @@ - } --- ./jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java 2013-12-01 11:14:36.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/rsa/RSAPrivateKeyImpl.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. @@ -69544,7 +72077,7 @@ - } --- ./jdk/src/share/classes/sun/security/ssl/Handshaker.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. @@ -69655,7 +72188,7 @@ /* --- ./jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/ssl/RSAClientKeyExchange.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved. @@ -69878,7 +72411,7 @@ } --- ./jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2014-07-15 23:24:36.000000000 -0700 @@ -172,7 +172,7 @@ /* * Drives the protocol state machine. @@ -69898,7 +72431,7 @@ /** --- ./jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2014-07-15 23:24:36.000000000 -0700 @@ -68,7 +68,7 @@ // performance optimization @@ -69909,7 +72442,7 @@ // supported pairs of signature and hash algorithm private final static Map<Integer, SignatureAndHashAlgorithm> supportedMap; --- ./jdk/src/share/classes/sun/security/tools/JarSigner.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/tools/JarSigner.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/tools/JarSigner.java 2014-07-15 23:24:36.000000000 -0700 @@ -88,9 +88,6 @@ private static final String META_INF = "META-INF/"; @@ -70135,7 +72668,7 @@ // display the certificate(s). The first one is end-entity cert and // its KeyUsage should be checked. --- ./jdk/src/share/classes/sun/security/tools/JarSignerResources.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/tools/JarSignerResources.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/tools/JarSignerResources.java 2014-07-15 23:24:36.000000000 -0700 @@ -110,9 +110,9 @@ {"Please.specify.alias.name", "Please specify alias name"}, {"Only.one.alias.can.be.specified", "Only one alias can be specified"}, @@ -70179,7 +72712,7 @@ /** --- ./jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/tools/JarSignerResources_ja.java 2014-07-15 23:24:36.000000000 -0700 @@ -79,7 +79,7 @@ {".verbose.suboptions.verbose.output.when.signing.verifying.", "[-verbose[:suboptions]] \u7F72\u540D/\u691C\u8A3C\u6642\u306E\u8A73\u7D30\u51FA\u529B\u3002"}, @@ -70221,7 +72754,7 @@ /** --- ./jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java 2013-09-06 11:28:45.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/tools/JarSignerResources_zh_CN.java 2014-07-15 23:24:36.000000000 -0700 @@ -53,9 +53,9 @@ {"If.keystore.is.not.password.protected.then.storepass.and.keypass.must.not.be.specified", "\u5982\u679C\u5BC6\u94A5\u5E93\u672A\u53D7\u53E3\u4EE4\u4FDD\u62A4, \u5219\u4E0D\u80FD\u6307\u5B9A -storepass \u548C -keypass"}, @@ -70276,18 +72809,30 @@ /** --- ./jdk/src/share/classes/sun/security/util/KeyUtil.java 2013-09-06 11:28:46.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/util/KeyUtil.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/util/KeyUtil.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2012, 2014, 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 -@@ -200,5 +200,24 @@ +@@ -198,7 +198,35 @@ + "Diffie-Hellman public key is too large"); + } - // Don't bother to check against the y^q mod p if safe primes are used. - } +- // Don't bother to check against the y^q mod p if safe primes are used. ++ // y^q mod p == 1? ++ // Unable to perform this check as q is unknown in this circumstance. ++ ++ // p is expected to be prime. However, it is too expensive to check ++ // that p is prime. Instead, in order to mitigate the impact of ++ // non-prime values, we check that y is not a factor of p. ++ BigInteger r = p.remainder(y); ++ if (r.equals(BigInteger.ZERO)) { ++ throw new InvalidKeyException("Invalid Diffie-Hellman parameters"); ++ } ++ } + + /** + * Trim leading (most significant) zeroes from the result. @@ -70305,12 +72850,12 @@ + byte[] t = new byte[b.length - i]; + System.arraycopy(b, i, t, 0, t.length); + return t; -+ } + } + } --- ./jdk/src/share/classes/sun/security/util/Resources_de.java 2013-09-06 11:28:46.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/util/Resources_de.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/util/Resources_de.java 2014-07-15 23:24:36.000000000 -0700 @@ -444,7 +444,7 @@ {"Retain", "Beibehalten"}, @@ -70321,7 +72866,7 @@ {"Add.Public.Key.Alias", "Public Key-Alias hinzuf\u00FCgen"}, {"Remove.Public.Key.Alias", "Public Key-Alias entfernen"}, --- ./jdk/src/share/classes/sun/security/util/Resources_fr.java 2013-09-06 11:28:46.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/util/Resources_fr.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/util/Resources_fr.java 2014-07-15 23:24:36.000000000 -0700 @@ -557,12 +557,12 @@ {"invalid.null.Class.provided", "classe NULL fournie non valide"}, {"Subject.", "Objet :\n"}, @@ -70340,7 +72885,7 @@ {"attempting.to.add.an.object.which.is.not.an.instance.of.java.security.Principal.to.a.Subject.s.Principal.Set", "tentative d'ajout d'un objet qui n'est pas une instance de java.security.Principal dans un ensemble de principaux du sujet"}, --- ./jdk/src/share/classes/sun/security/util/Resources_zh_CN.java 2013-09-06 11:28:46.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/util/Resources_zh_CN.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/util/Resources_zh_CN.java 2014-07-15 23:24:36.000000000 -0700 @@ -310,7 +310,7 @@ "\u60A8\u7684\u5BC6\u94A5\u5E93\u5305\u542B {0,number,integer} \u4E2A\u6761\u76EE"}, {"Your.keystore.contains.keyStore.size.entries", @@ -70351,7 +72896,7 @@ {"Not.X.509.certificate", "\u975E X.509 \u8BC1\u4E66"}, {"alias.has.no.public.key", "{0}\u6CA1\u6709\u516C\u5171\u5BC6\u94A5"}, --- ./jdk/src/share/classes/sun/security/util/Resources_zh_TW.java 2013-09-06 11:28:46.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/util/Resources_zh_TW.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/util/Resources_zh_TW.java 2014-07-15 23:24:36.000000000 -0700 @@ -388,7 +388,7 @@ {"Certificate.chain.in.reply.does.not.verify.", "\u56DE\u8986\u6642\u7684\u6191\u8B49\u93C8\u672A\u9A57\u8B49: "}, @@ -70362,7 +72907,7 @@ {"Install.reply.anyway.no.", "\u9084\u662F\u8981\u5B89\u88DD\u56DE\u8986\uFF1F [\u5426]: "}, {"NO", "\u5426"}, --- ./jdk/src/share/classes/sun/security/util/SecurityConstants.java 2013-09-06 11:28:46.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/util/SecurityConstants.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/share/classes/sun/security/util/SecurityConstants.java 2014-07-15 23:24:36.000000000 -0700 @@ -257,5 +257,5 @@ // java.lang.SecurityManager @@ -70371,7 +72916,7 @@ + new SocketPermission("localhost:0", SOCKET_LISTEN_ACTION); } --- ./jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java 2013-09-06 11:28:46.000000000 -0700 -+++ ./jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/share/classes/sun/security/util/SignatureFileVerifier.java 2014-07-15 23:24:36.000000000 -0700 @@ -153,6 +153,52 @@ return false; } @@ -70426,7 +72971,7 @@ private MessageDigest getDigest(String algorithm) --- ./jdk/src/share/classes/sun/swing/SwingLazyValue.java 2013-09-06 11:28:47.000000000 -0700 -+++ ./jdk/src/share/classes/sun/swing/SwingLazyValue.java 2013-12-01 11:14:36.000000000 -0800 ++++ ./jdk/src/share/classes/sun/swing/SwingLazyValue.java 2014-07-15 23:24:36.000000000 -0700 @@ -30,6 +30,7 @@ import java.security.AccessController; import java.security.PrivilegedAction; @@ -70445,7 +72990,7 @@ if (methodName != null) { Class[] types = getClassArray(args); --- ./jdk/src/share/classes/sun/swing/SwingUtilities2.java 2013-09-06 11:28:47.000000000 -0700 -+++ ./jdk/src/share/classes/sun/swing/SwingUtilities2.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/swing/SwingUtilities2.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. @@ -70629,7 +73174,7 @@ * access the system clipboard and if it is allowed gesture (if * checkGesture true) --- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2014-07-15 23:24:36.000000000 -0700 @@ -30,4 +30,5 @@ #[solaris]sun.tools.attach.SolarisAttachProvider #[windows]sun.tools.attach.WindowsAttachProvider @@ -70637,7 +73182,7 @@ +#[bsd]sun.tools.attach.BsdAttachProvider #[macosx]sun.tools.attach.BsdAttachProvider --- ./jdk/src/share/classes/sun/tools/jar/Main.java 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2014-07-15 23:24:36.000000000 -0700 @@ -51,6 +51,7 @@ String zname = ""; String[] files; @@ -70709,7 +73254,7 @@ throw new IOException(formatMsg( "error.create.dir", d.getPath())); --- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2014-07-15 23:24:36.000000000 -0700 @@ -44,6 +44,8 @@ {0} : could not create directory error.incorrect.length=\ @@ -70720,7 +73265,7 @@ added manifest out.update.manifest=\ --- ./jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties 2014-01-18 12:16:28.000000000 -0800 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_de.properties 2014-07-15 23:24:36.000000000 -0700 @@ -41,7 +41,7 @@ out.stored=(0 % gespeichert) out.create=\ erstellt: {0} @@ -70731,7 +73276,7 @@ usage=Verwendung: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] Dateien...\nOptionen:\n -c Neues Archiv erstellen\n -t Inhaltsverzeichnis f\u00FCr Archiv auflisten\n -x Genannte (oder alle) Dateien aus Archiv extrahieren\n -u Vorhandenes Archiv aktualisieren\n -v Verbose-Ausgabe f\u00FCr Standardausgabe generieren\n -f Namen der Archivdatei angeben\n -m Manifest-Informationen von angegebener Manifest-Datei einschlie\u00DFen\n -e Anwendungs-Einstiegspunkt f\u00FCr die \n in einer ausf\u00FChrbaren JAR-Datei geb\u00FCndelte Standalone-Anwendung angeben\n -0 Nur speichern (keine ZIP-Komprimierung)\n -M Keine Manifest-Datei f\u00FCr die Eintr\u00E4ge erstellen\n -i Indexinformationen f\u00FCr angegebenen JAR-Dateien erstellen\n -C zum angegebenen Verzeichnis wechseln und folgende Datei einschlie\u00DFen\nFalls eine Datei ein Verzeichnis ist, wird dieses rekursiv verarbeitet.\nDer Name der Manifest-Datei, der Name der Archivdatei und der Name des Einstiegspunkts werden\nin derselben Reihenfolge wie die Kennzeichen "m", "f" und "e" angegeben.\n\nBeispiel 1: Archivieren Sie zwei Klassendateien in ein Archiv mit Namen "classes.jar": \n jar cvf classes.jar Foo.class Bar.class \nBeispiel 2: Verwenden Sie die vorhandenen Manifest-Datei "mymanifest", und archivieren Sie\n alle Dateien im Verzeichnis foo/ in "classes.jar": \n jar cvfm classes.jar mymanifest -C foo/ .\n --- ./jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties 2014-01-18 12:16:28.000000000 -0800 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_es.properties 2014-07-15 23:24:36.000000000 -0700 @@ -41,7 +41,7 @@ out.stored=(almacenado 0%) out.create=\ creado: {0} @@ -70743,7 +73288,7 @@ -usage=Sintaxis: jar {ctxui}[vfm0Me] [archive-jar] [archive-manifiesto] [punto-entrada] [-C dir] archivos...\nOpciones:\n -c crear nuevo archivo\n -t crear la tabla de contenido del archivo\n -x extraer el archive mencionado (o todos) del archivo\n -u actualizar archive existente\n -v generar salida detallada de los datos de salida est\u00E1ndar\n -f especificar nombre de archive de almacenamiento\n -m incluir informaci\u00F3n de manifiesto del archive de manifiesto especificado\n -e especificar punto de entrada de la aplicaci\u00F3n para la aplicaci\u00F3n aut\u00F3noma \n que se incluye dentro de un archive jar ejecutable\n -0 s\u00F3lo almacenar; no utilizar compresi\u00F3n ZIP\n -M no crear un archive de manifiesto para las entradas\n -i generar informaci\u00F3n de \u00EDndice para los archives jar especificados\n -C cambiar al directorio especificado e incluir el archivo siguiente\nSi alg\u00FAn archivo es un directorio, se procesar\u00E1 de forma recurrente.\nEl nombre del archivo de manifiesto, el nombre del archivo de almacenamiento y el nombre del punto de entrada se\nespecifican en el mismo orden que los indicadores 'm', 'f' y 'e'.\n\nEjemplo 1: para archivar archivos de dos clases en un archivo llamado classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nEjemplo 2: utilice un archivo de manifiesto existente 'mymanifest' y archive todos los\n archivos del directorio foo/ en 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/ .\n +usage=Sintaxis: jar {ctxui}[vfm0Me] [archive-jar] [archive-manifiesto] [punto-entrada] [-C dir] archivos...\nOpciones:\n -c crear nuevo archivo\n -t crear la tabla de contenido del archivo\n -x extraer el archive mencionado (o todos) del archivo\n -u actualizar archive existente\n -v generar salida detallada de los datos de salida est\u00E1ndar\n -f especificar nombre de archive de almacenamiento\n -m incluir informaci\u00F3n de manifiesto del archive de manifiesto especificado\n -e especificar punto de entrada de la aplicaci\u00F3n para la aplicaci\u00F3n aut\u00F3noma \n que se incluye dentro de un archive jar ejecutable\n -0 s\u00F3lo almacenar; no utilizar compresi\u00F3n ZIP\n -M no crear un archive de manifiesto para las entradas\n -i generar informaci\u00F3n de \u00EDndice para los archives jar especificados\n -C cambiar al directorio especificado e incluir el archivo siguiente\nSi alg\u00FAn archivo es un directorio, se procesar\u00E1 de forma recurrente.\nEl nombre del archivo de manifiesto, el nombre del archivo de almacenamiento y el nombre del punto de entrada se\nespecifican en el mismo orden que los indicadores 'm', 'f' y 'e'.\n\nEjemplo 1: para archivar archivos de dos clases en un archivo llamado classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nEjemplo 2: utilice un archivo de manifiesto existente 'mymanifest' y archive todos los\n archivos del directorio foo/ en 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/ .\n --- ./jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties 2014-01-18 12:16:28.000000000 -0800 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_fr.properties 2014-07-15 23:24:36.000000000 -0700 @@ -41,7 +41,7 @@ out.stored=(stockage : 0 %) out.create=\ cr\u00E9\u00E9 : {0} @@ -70754,7 +73299,7 @@ usage=Syntaxe : jar {ctxui}[vfm0Me] [fichier-jar] [fichier-manifeste] [point-entr\u00E9e] [-C r\u00E9p] fichiers...\nOptions :\n -c cr\u00E9e une archive\n -t affiche la table des mati\u00E8res de l'archive\n -x extrait les fichiers nomm\u00E9s (ou tous les fichiers) de l'archive\n -u met \u00E0 jour l'archive existante\n -v g\u00E9n\u00E8re une version d\u00E9taill\u00E9e d'une sortie standard\n -f sp\u00E9cifie le nom du fichier archive\n -m inclut les informations de manifeste \u00E0 partir du fichier de manifeste sp\u00E9cifi\u00E9\n -e sp\u00E9cifie le point d'entr\u00E9e d'une application en mode autonome \n int\u00E9gr\u00E9e \u00E0 un fichier JAR ex\u00E9cutable\n -0 stockage uniquement, pas de compression ZIP\n -M ne cr\u00E9e pas de fichier manifeste pour les entr\u00E9es\n -i g\u00E9n\u00E8re les informations d'index des fichiers JAR sp\u00E9cifi\u00E9s\n -C passe au r\u00E9pertoire sp\u00E9cifi\u00E9 et inclut le fichier suivant\nSi l'un des fichiers est un r\u00E9pertoire, celui-ci est trait\u00E9 r\u00E9cursivement.\nLes noms du fichier manifeste, du fichier archive et du point d'entr\u00E9e sont\nsp\u00E9cifi\u00E9s dans le m\u00EAme ordre que celui des indicateurs m, f et e.\n\nExemple 1 : pour archiver deux fichiers de classe dans une archive intitul\u00E9e classes.jar : \n jar cvf classes.jar Foo.class Bar.class \nExemple 2 : pour utiliser un fichier manifeste existant 'monmanifeste', puis archiver tous les\n fichiers du r\u00E9pertoire foo/ dans 'classes.jar' : \n jar cvfm classes.jar monmanifeste -C foo/ .\n --- ./jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties 2014-01-18 12:16:28.000000000 -0800 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_it.properties 2014-07-15 23:24:36.000000000 -0700 @@ -41,7 +41,7 @@ out.stored=(memorizzato 0%) out.create=\ creato: {0} @@ -70766,7 +73311,7 @@ -usage=Uso: jar {ctxui}[vfm0Me] [file-jar] [file-manifest] [punto di ingresso] [-C dir] file ...\nOpzioni:\n -c crea un nuovo archivio\n -t visualizza l'indice dell'archivio\n -x estrae i file con nome (o tutti i file) dall'archivio\n -u aggiorna l'archivio esistente\n -v genera output commentato dall'output standard\n -f specifica il nome file dell'archivio\n -m include informazioni manifest dal file manifest specificato\n -e specifica il punto di ingresso per l'applicazione stand-alone \n inclusa nel file jar eseguibile\n -0 solo memorizzazione; senza compressione ZIP\n -M consente di non creare un file manifest per le voci\n -i genera informazioni sull'indice per i file jar specificati\n -C imposta la directory specificata e include il file seguente\nSe un file \u00E8 una directory, verr\u00E0 elaborato in modo ricorsivo.\nIl nome del file manifest, del file di archivio e del punto di ingresso devono\nessere specificati nello stesso ordine dei flag 'm', 'f' ed 'e'.\n\nEsempio 1: archiviazione di due file di classe in un archivio con il nome classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nEsempio 2: utilizzo del file manifest esistente 'mymanifest' e archiviazione di tutti i\n file della directory foo/ in 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/.\n +usage=Uso: jar {ctxui}[vfm0Me] [file-jar] [file-manifest] [punto di ingresso] [-C dir] file ...\nOpzioni:\n -c crea un nuovo archivio\n -t visualizza l'indice dell'archivio\n -x estrae i file con nome (o tutti i file) dall'archivio\n -u aggiorna l'archivio esistente\n -v genera output commentato dall'output standard\n -f specifica il nome file dell'archivio\n -m include informazioni manifest dal file manifest specificato\n -e specifica il punto di ingresso per l'applicazione stand-alone \n inclusa nel file jar eseguibile\n -0 solo memorizzazione; senza compressione ZIP\n -M consente di non creare un file manifest per le voci\n -i genera informazioni sull'indice per i file jar specificati\n -C imposta la directory specificata e include il file seguente\nSe un file \u00E8 una directory, verr\u00E0 elaborato in modo ricorsivo.\nIl nome del file manifest, del file di archivio e del punto di ingresso devono\nessere specificati nello stesso ordine dei flag 'm', 'f' ed 'e'.\n\nEsempio 1: archiviazione di due file di classe in un archivio con il nome classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nEsempio 2: utilizzo del file manifest esistente 'mymanifest' e archiviazione di tutti i\n file della directory foo/ in 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/ .\n --- ./jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties 2014-01-18 12:16:28.000000000 -0800 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_ja.properties 2014-07-15 23:24:36.000000000 -0700 @@ -41,7 +41,7 @@ out.stored=(0%\u683C\u7D0D\u3055\u308C\u307E\u3057\u305F) out.create=\ {0}\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F @@ -70778,7 +73323,7 @@ -usage=\u4F7F\u7528\u65B9\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u30AA\u30D7\u30B7\u30E7\u30F3:\n -c \u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B\n -t \u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u4E00\u89A7\u8868\u793A\u3059\u308B\n -x \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3059\u308B\n -u \u65E2\u5B58\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3059\u308B\n -v \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n -f \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3059\u308B\n -m \u6307\u5B9A\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u60C5\u5831\u3092\u53D6\u308A\u8FBC\u3080\n -e \u5B9F\u884C\u53EF\u80FDjar\u30D5\u30A1\u30A4\u30EB\u306B\u30D0\u30F3\u30C9\u30EB\u3055\u308C\u305F\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n \u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u3092\u6307\u5B9A\u3059\u308B\n -0 \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u306A\u3044\n -M \u30A8\u30F3\u30C8\u30EA\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u306A\u3044\n -i \u6307\u5B9A\u306Ejar\u30D5\u30A1\u30A4\u30EB\u306E\u7D22\u5F15\u60C5\u5831\u3092\u751F\u6210\u3059\u308B\n -C \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u4EE5\u4E0B\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u308A\u8FBC\u3080\n\u30D5\u30A1\u30A4\u30EB\u304C\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u5834\u5408\u306F\u518D\u5E30\u7684\u306B\u51E6\u7406\u3055\u308C\u307E\u3059\u3002\n\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3001\u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u304A\u3088\u3073\u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u540D\u306F\u3001\n\u30D5\u30E9\u30B0'm'\u3001'f'\u3001'e'\u306E\u6307\u5B9A\u3068\u540C\u3058\u9806\u756A\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\n\u4F8B1: 2\u3064\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6classes.jar\u306B\u4FDD\u5B58\u3059\u308B:\n jar cvf classes.jar Foo.class Bar.class\n\u4F8B2: \u65E2\u5B58\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB'mymanifest'\u3092\u4F7F\u7528\u3057\u3001foo/\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\n \u5168\u30D5\u30A1\u30A4\u30EB\u3092'classes.jar'\u306B\u30A2\u30FC\u30AB\u30A4\u30D6\u3059\u308B:\n jar cvfm classes.jar mymanifest -C foo/ \n +usage=\u4F7F\u7528\u65B9\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u30AA\u30D7\u30B7\u30E7\u30F3:\n -c \u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u65B0\u898F\u4F5C\u6210\u3059\u308B\n -t \u30A2\u30FC\u30AB\u30A4\u30D6\u306E\u5185\u5BB9\u3092\u4E00\u89A7\u8868\u793A\u3059\u308B\n -x \u6307\u5B9A\u306E(\u307E\u305F\u306F\u3059\u3079\u3066\u306E)\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6\u304B\u3089\u62BD\u51FA\u3059\u308B\n -u \u65E2\u5B58\u30A2\u30FC\u30AB\u30A4\u30D6\u3092\u66F4\u65B0\u3059\u308B\n -v \u6A19\u6E96\u51FA\u529B\u306B\u8A73\u7D30\u306A\u51FA\u529B\u3092\u751F\u6210\u3059\u308B\n -f \u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3092\u6307\u5B9A\u3059\u308B\n -m \u6307\u5B9A\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u304B\u3089\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u60C5\u5831\u3092\u53D6\u308A\u8FBC\u3080\n -e \u5B9F\u884C\u53EF\u80FDjar\u30D5\u30A1\u30A4\u30EB\u306B\u30D0\u30F3\u30C9\u30EB\u3055\u308C\u305F\u30B9\u30BF\u30F3\u30C9\u30A2\u30ED\u30F3\u30FB\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\n \u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u3092\u6307\u5B9A\u3059\u308B\n -0 \u683C\u7D0D\u306E\u307F\u3002ZIP\u5727\u7E2E\u3092\u4F7F\u7528\u3057\u306A\u3044\n -M \u30A8\u30F3\u30C8\u30EA\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u4F5C\u6210\u3057\u306A\u3044\n -i \u6307\u5B9A\u306Ejar\u30D5\u30A1\u30A4\u30EB\u306E\u7D22\u5F15\u60C5\u5831\u3092\u751F\u6210\u3059\u308B\n -C \u6307\u5B9A\u306E\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306B\u5909\u66F4\u3057\u3001\u4EE5\u4E0B\u306E\u30D5\u30A1\u30A4\u30EB\u3092\u53D6\u308A\u8FBC\u3080\n\u30D5\u30A1\u30A4\u30EB\u304C\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\u5834\u5408\u306F\u518D\u5E30\u7684\u306B\u51E6\u7406\u3055\u308C\u307E\u3059\u3002\n\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u3001\u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u30D5\u30A1\u30A4\u30EB\u540D\u304A\u3088\u3073\u30A8\u30F3\u30C8\u30EA\u30FB\u30DD\u30A4\u30F3\u30C8\u540D\u306F\u3001\n\u30D5\u30E9\u30B0'm'\u3001'f'\u3001'e'\u306E\u6307\u5B9A\u3068\u540C\u3058\u9806\u756A\u3067\u6307\u5B9A\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\n\n\u4F8B1: 2\u3064\u306E\u30AF\u30E9\u30B9\u30FB\u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30FC\u30AB\u30A4\u30D6classes.jar\u306B\u4FDD\u5B58\u3059\u308B:\n jar cvf classes.jar Foo.class Bar.class\n\u4F8B2: \u65E2\u5B58\u306E\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u30FB\u30D5\u30A1\u30A4\u30EB'mymanifest'\u3092\u4F7F\u7528\u3057\u3001foo/\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA\u306E\n \u5168\u30D5\u30A1\u30A4\u30EB\u3092'classes.jar'\u306B\u30A2\u30FC\u30AB\u30A4\u30D6\u3059\u308B:\n jar cvfm classes.jar mymanifest -C foo/ .\n --- ./jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties 2014-01-18 12:16:28.000000000 -0800 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_ko.properties 2014-07-15 23:24:36.000000000 -0700 @@ -34,14 +34,14 @@ error.create.dir={0}: \uB514\uB809\uD1A0\uB9AC\uB97C \uC0DD\uC131\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4. error.incorrect.length=\uCC98\uB9AC \uC911 \uC62C\uBC14\uB974\uC9C0 \uC54A\uC740 \uAE38\uC774\uAC00 \uBC1C\uACAC\uB428: {0} @@ -70798,7 +73343,7 @@ -usage=\uC0AC\uC6A9\uBC95: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\uC635\uC158:\n -c \uC0C8 \uC544\uCE74\uC774\uBE0C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -t \uC544\uCE74\uC774\uBE0C\uC5D0 \uB300\uD55C \uBAA9\uCC28\uB97C \uB098\uC5F4\uD569\uB2C8\uB2E4.\n -x \uBA85\uBA85\uB41C(\uB610\uB294 \uBAA8\uB4E0) \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uC5D0\uC11C \uCD94\uCD9C\uD569\uB2C8\uB2E4.\n -u \uAE30\uC874 \uC544\uCE74\uC774\uBE0C\uB97C \uAC31\uC2E0\uD569\uB2C8\uB2E4.\n -v \uD45C\uC900 \uCD9C\uB825\uC5D0 \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -f \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n -m \uC9C0\uC815\uB41C Manifest \uD30C\uC77C\uC758 Manifest \uC815\uBCF4\uB97C \uD3EC\uD568\uD569\uB2C8\uB2E4.\n -e jar \uC2E4\uD589 \uD30C\uC77C\uC5D0 \uBC88\uB4E4\uB85C \uC81C\uACF5\uB41C \uB3C5\uB9BD\uD615 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC758 \n \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC2DC\uC791 \uC9C0\uC810\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n -0 \uC800\uC7A5 \uC804\uC6A9: ZIP \uC555\uCD95\uC744 \uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -M \uD56D\uBAA9\uC5D0 \uB300\uD574 Manifest \uD30C\uC77C\uC744 \uC0DD\uC131\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -i \uC9C0\uC815\uB41C jar \uD30C\uC77C\uC5D0 \uB300\uD55C \uC778\uB371\uC2A4 \uC815\uBCF4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -C \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uB85C \uBCC0\uACBD\uD558\uACE0 \uB2E4\uC74C \uD30C\uC77C\uC744 \uD3EC\uD568\uD569\uB2C8\uB2E4.\n\uD2B9\uC815 \uD30C\uC77C\uC774 \uB514\uB809\uD1A0\uB9AC\uC77C \uACBD\uC6B0 \uC21C\uD658\uC801\uC73C\uB85C \uCC98\uB9AC\uB429\uB2C8\uB2E4.\nManifest \uD30C\uC77C \uC774\uB984, \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984 \uBC0F \uC2DC\uC791 \uC9C0\uC810 \uC774\uB984\uC740\n'm', 'f' \uBC0F 'e' \uD50C\uB798\uADF8\uC640 \uB3D9\uC77C\uD55C \uC21C\uC11C\uB85C \uC9C0\uC815\uB429\uB2C8\uB2E4.\n\n\uC608 1: classes.jar\uB77C\uB294 \uC544\uCE74\uC774\uBE0C\uC5D0 \uB450 \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n jar cvf classes.jar Foo.class Bar.class \n\uC608 2: \uAE30\uC874 Manifest \uD30C\uC77C 'mymanifest'\uB97C \uC0AC\uC6A9\uD558\uC5EC\n foo/ \uB514\uB809\uD1A0\uB9AC\uC758 \uBAA8\uB4E0 \uD30C\uC77C\uC744 'classes.jar'\uB85C \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n jar cvfm classes.jar mymanifest -C foo/ .\n +usage=\uC0AC\uC6A9\uBC95: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\uC635\uC158:\n -c \uC0C8 \uC544\uCE74\uC774\uBE0C\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -t \uC544\uCE74\uC774\uBE0C\uC5D0 \uB300\uD55C \uBAA9\uCC28\uB97C \uB098\uC5F4\uD569\uB2C8\uB2E4.\n -x \uBA85\uBA85\uB41C(\uB610\uB294 \uBAA8\uB4E0) \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uC5D0\uC11C \uCD94\uCD9C\uD569\uB2C8\uB2E4.\n -u \uAE30\uC874 \uC544\uCE74\uC774\uBE0C\uB97C \uC5C5\uB370\uC774\uD2B8\uD569\uB2C8\uB2E4.\n -v \uD45C\uC900 \uCD9C\uB825\uC5D0 \uC0C1\uC138 \uC815\uBCF4 \uCD9C\uB825\uC744 \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -f \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n -m \uC9C0\uC815\uB41C Manifest \uD30C\uC77C\uC758 Manifest \uC815\uBCF4\uB97C \uD3EC\uD568\uD569\uB2C8\uB2E4.\n -e jar \uC2E4\uD589 \uD30C\uC77C\uC5D0 \uBC88\uB4E4\uB85C \uC81C\uACF5\uB41C \uB3C5\uB9BD\uD615 \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8\uC758 \n \uC751\uC6A9 \uD504\uB85C\uADF8\uB7A8 \uC2DC\uC791 \uC9C0\uC810\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.\n -0 \uC800\uC7A5 \uC804\uC6A9: ZIP \uC555\uCD95\uC744 \uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -M \uD56D\uBAA9\uC5D0 \uB300\uD574 Manifest \uD30C\uC77C\uC744 \uC0DD\uC131\uD558\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.\n -i \uC9C0\uC815\uB41C jar \uD30C\uC77C\uC5D0 \uB300\uD55C \uC778\uB371\uC2A4 \uC815\uBCF4\uB97C \uC0DD\uC131\uD569\uB2C8\uB2E4.\n -C \uC9C0\uC815\uB41C \uB514\uB809\uD1A0\uB9AC\uB85C \uBCC0\uACBD\uD558\uACE0 \uB2E4\uC74C \uD30C\uC77C\uC744 \uD3EC\uD568\uD569\uB2C8\uB2E4.\n\uD2B9\uC815 \uD30C\uC77C\uC774 \uB514\uB809\uD1A0\uB9AC\uC77C \uACBD\uC6B0 \uC21C\uD658\uC801\uC73C\uB85C \uCC98\uB9AC\uB429\uB2C8\uB2E4.\nManifest \uD30C\uC77C \uC774\uB984, \uC544\uCE74\uC774\uBE0C \uD30C\uC77C \uC774\uB984 \uBC0F \uC2DC\uC791 \uC9C0\uC810 \uC774\uB984\uC740\n'm', 'f' \uBC0F 'e' \uD50C\uB798\uADF8\uC640 \uB3D9\uC77C\uD55C \uC21C\uC11C\uB85C \uC9C0\uC815\uB429\uB2C8\uB2E4.\n\n\uC608 1: classes.jar\uB77C\uB294 \uC544\uCE74\uC774\uBE0C\uC5D0 \uB450 \uD074\uB798\uC2A4 \uD30C\uC77C\uC744 \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n jar cvf classes.jar Foo.class Bar.class \n\uC608 2: \uAE30\uC874 Manifest \uD30C\uC77C 'mymanifest'\uB97C \uC0AC\uC6A9\uD558\uC5EC\n foo/ \uB514\uB809\uD1A0\uB9AC\uC758 \uBAA8\uB4E0 \uD30C\uC77C\uC744 'classes.jar'\uB85C \uC544\uCE74\uC774\uBE0C\uD558\uB294 \uBC29\uBC95: \n jar cvfm classes.jar mymanifest -C foo/ .\n --- ./jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_pt_BR.properties 2014-07-15 23:24:36.000000000 -0700 @@ -37,11 +37,11 @@ out.update.manifest=manifesto atualizado out.ignore.entry=ignorando entrada {0} @@ -70816,7 +73361,7 @@ -usage=Uso: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] arquivos ...\nOp\u00E7\u00F5es:\n -c cria novo arquivo compactado\n -t lista o sum\u00E1rio do arquivo compactado\n -x extrai arquivos com o nome (ou todos) do arquivo compactado\n -u atualizar o arquivo compactado existente\n -v gera sa\u00EDda detalhada na sa\u00EDda padr\u00E3o\n -f especifica o nome do arquivo do arquivo compactado\n -m inclui as informa\u00E7\u00F5es do manifesto do arquivo de manifesto especificado\n -e especifica o ponto de entrada da aplica\u00E7\u00E3o para aplica\u00E7\u00E3o independente \n empacotando em um arquivo jar execut\u00E1vel\n -0 armazena somente; n\u00E3o usa compacta\u00E7\u00E3o ZIP\n -M n\u00E3o cria um arquivo de manifesto para as entradas\n -i gera informa\u00E7\u00F5es de \u00EDndice para os arquivos especificados\n -C altera para o diret\u00F3rio e inclui o arquivo seguinte\nSe nenhum arquivo for um diret\u00F3rio, ent\u00E3o ser\u00E1 processado repetidamente.\nO nome do arquivo de manifesto, o nome do arquivo compactado e o nome do ponto de entrada s\u00E3o\nespecificados na mesma ordem dos flags 'm', 'f' e 'e'.\n\nExemplo 1: para arquivar dois arquivos de classe em um arquivo compactado com o nome classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nExemplo 2: use um arquivo de manifesto existente 'mymanifest' e arquive todos os\n arquivos no diret\u00F3rio foo/ na 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/ .\n +usage=Uso: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] arquivos ...\nOp\u00E7\u00F5es:\n -c cria novo arquivo compactado\n -t lista o sum\u00E1rio do arquivo compactado\n -x extrai arquivos com o nome (ou todos) do arquivo compactado\n -u atualiza o arquivo compactado existente\n -v gera sa\u00EDda detalhada na sa\u00EDda padr\u00E3o\n -f especifica o nome do arquivo do arquivo compactado\n -m inclui as informa\u00E7\u00F5es do manifesto do arquivo de manifesto especificado\n -e especifica o ponto de entrada da aplica\u00E7\u00E3o para aplica\u00E7\u00E3o independente \n empacotando em um arquivo jar execut\u00E1vel\n -0 armazena somente; n\u00E3o usa compacta\u00E7\u00E3o ZIP\n -M n\u00E3o cria um arquivo de manifesto para as entradas\n -i gera informa\u00E7\u00F5es de \u00EDndice para os arquivos especificados\n -C passa para o diret\u00F3rio especificado e inclui o arquivo a seguir\nSe um arquivo tamb\u00E9m for um diret\u00F3rio, ele ser\u00E1 processado repetidamente.\nO nome do arquivo de manifesto, o nome do arquivo compactado e o nome do ponto de entrada s\u00E3o\nespecificados na mesma ordem dos flags 'm', 'f' e 'e'.\n\nExemplo 1: para arquivar dois arquivos de classe em um arquivo compactado denominado classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nExemplo 2: use um arquivo de manifesto existente 'mymanifest' e arquive todos os\n arquivos no diret\u00F3rio foo/ na 'classes.jar': \n jar cvfm classes.jar mymanifest -C foo/ .\n --- ./jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties 2014-01-18 12:16:28.000000000 -0800 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_sv.properties 2014-07-15 23:24:36.000000000 -0700 @@ -44,4 +44,4 @@ out.inflated=\ uppackat: {0} out.size=(in = {0}) (ut = {1}) @@ -70824,7 +73369,7 @@ -usage=Syntax: jar {ctxui}[vfm0Me] [jar fil] [manifestfil] [startpunkt] [-C-katalog] ...\nAlternativ:\n -c skapa nytt arkiv\n -t lista inneh\u00E5llsf\u00F6rteckning f\u00F6r arkiv\n -x extrahera namngivna (eller alla) filer fr\u00E5n arkiv\n -u uppdatera befintligt arkiv\n -v generera utf\u00F6rliga utdata vid standardutmatning\n -f ange arkivfilens namn\n -m inkludera manifestinformation fr\u00E5n angivet manifest\n -e ange programstartpunkt f\u00F6r frist\u00E5ende applikation \n som medf\u00F6ljer i en jar-programfil\n -0 endast lagra (ingen zip-komprimering)\n -M skapa inte n\u00E5gon manifestfil f\u00F6r posterna\n -i generera indexinformation f\u00F6r de angivna jar-filerna\n -C \u00E4ndra till den angivna katalogen och inkludera f\u00F6ljande fil\nOm en fil \u00E4r en katalog bearbetas den rekursivt.\nNamnen p\u00E5 manifestfilen, arkivfilen och startpunkten anges i samma\nordning som m-, f- och e-flaggorna.\n\nExempel 1: S\u00E5 h\u00E4r arkiverar du tv\u00E5 klassfiler i ett arkiv med namnet classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nExempel 2: Anv\u00E4nd en befintlig manifestfil (mymanifest) och arkivera alla\n filer fr\u00E5n katalogen foo/ i classes.jar: \n jar cvfm classes.jar mymanifest -C foo/ .\n +usage=Syntax: jar {ctxui}[vfm0Me] [jar-fil] [manifestfil] [startpunkt] [-C katalog] filer...\nAlternativ:\n -c skapa nytt arkiv\n -t lista inneh\u00E5llsf\u00F6rteckning f\u00F6r arkiv\n -x extrahera namngivna (eller alla) filer fr\u00E5n arkiv\n -u uppdatera befintligt arkiv\n -v generera utf\u00F6rliga utdata vid standardutmatning\n -f ange arkivfilens namn\n -m inkludera manifestinformation fr\u00E5n angivet manifest\n -e ange programstartpunkt f\u00F6r frist\u00E5ende applikation \n som medf\u00F6ljer i en jar-programfil\n -0 endast lagra (ingen zip-komprimering)\n -M skapa inte n\u00E5gon manifestfil f\u00F6r posterna\n -i generera indexinformation f\u00F6r de angivna jar-filerna\n -C \u00E4ndra till den angivna katalogen och inkludera f\u00F6ljande fil\nOm en fil \u00E4r en katalog bearbetas den rekursivt.\nNamnen p\u00E5 manifestfilen, arkivfilen och startpunkten anges i samma\nordning som m-, f- och e-flaggorna.\n\nExempel 1: S\u00E5 h\u00E4r arkiverar du tv\u00E5 klassfiler i ett arkiv med namnet classes.jar: \n jar cvf classes.jar Foo.class Bar.class \nExempel 2: Anv\u00E4nd en befintlig manifestfil (mymanifest) och arkivera alla\n filer fr\u00E5n katalogen foo/ i classes.jar: \n jar cvfm classes.jar mymanifest -C foo/ .\n --- ./jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties 2014-01-18 12:16:28.000000000 -0800 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_zh_CN.properties 2014-07-15 23:24:36.000000000 -0700 @@ -44,4 +44,4 @@ out.inflated=\ \u5DF2\u89E3\u538B: {0} out.size=(\u8F93\u5165 = {0}) (\u8F93\u51FA = {1}) @@ -70832,7 +73377,7 @@ -usage=\u7528\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u9009\u9879\u5305\u62EC: \n -c \u521B\u5EFA\u65B0\u7684\u5F52\u6863\u6587\u4EF6\n -t \u5217\u51FA\u5F52\u6863\u76EE\u5F55\n -x \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684 (\u6216\u6240\u6709) \u6587\u4EF6\n -u \u66F4\u65B0\u73B0\u6709\u7684\u5F52\u6863\u6587\u4EF6\n -v \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA\n -f \u6307\u5B9A\u5F52\u6863\u6587\u4EF6\u540D\n -m \u5305\u542B\u6307\u5B9A\u6E05\u5355\u6587\u4EF6\u4E2D\u7684\u6E05\u5355\u4FE1\u606F\n -e \u4E3A\u6346\u7ED1\u5230\u53EF\u6267\u884C jar \u6587\u4EF6\u7684\u72EC\u7ACB\u5E94\u7528\u7A0B\u5E8F\n \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u5165\u53E3\u70B9\n -0 \u4EC5\u5B58\u50A8; \u4E0D\u4F7F\u7528\u60C5\u51B5\u4EFB\u4F55 ZIP \u538B\u7F29\n -M \u4E0D\u521B\u5EFA\u6761\u76EE\u7684\u6E05\u5355\u6587\u4EF6\n -i \u4E3A\u6307\u5B9A\u7684 jar \u6587\u4EF6\u751F\u6210\u7D22\u5F15\u4FE1\u606F\n -C \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\u5176\u4E2D\u7684\u6587\u4EF6\n\u5982\u679C\u6709\u4EFB\u4F55\u76EE\u5F55\u6587\u4EF6, \u5219\u5BF9\u5176\u8FDB\u884C\u9012\u5F52\u5904\u7406\u3002\n\u6E05\u5355\u6587\u4EF6\u540D, \u5F52\u6863\u6587\u4EF6\u540D\u548C\u5165\u53E3\u70B9\u540D\u79F0\u7684\u6307\u5B9A\u987A\u5E8F\n\u4E0E 'm', 'f' \u548C 'e' \u6807\u8BB0\u7684\u6307\u5B9A\u987A\u5E8F\u76F8\u540C\u3002\n\n\u793A\u4F8B 1: \u5C06\u4E24\u4E2A\u7C7B\u6587\u4EF6\u5F52\u6863\u5230\u4E00\u4E2A\u540D\u4E3A classes.jar \u7684\u5F52\u6863\u6587\u4EF6\u4E2D: \n jar cvf classes.jar Foo.class Bar.class \n\u793A\u4F8B 2: \u4F7F\u7528\u73B0\u6709\u7684\u6E05\u5355\u6587\u4EF6 'mymanifest' \u5E76\n \u5C06 foo/ \u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5F52\u6863\u5230 'classes.jar' \u4E2D: \n jar cvfm classes.jar mymanifest -C foo/\u3002\n +usage=\u7528\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] files ...\n\u9009\u9879\u5305\u62EC: \n -c \u521B\u5EFA\u65B0\u7684\u5F52\u6863\u6587\u4EF6\n -t \u5217\u51FA\u5F52\u6863\u76EE\u5F55\n -x \u4ECE\u6863\u6848\u4E2D\u63D0\u53D6\u6307\u5B9A\u7684 (\u6216\u6240\u6709) \u6587\u4EF6\n -u \u66F4\u65B0\u73B0\u6709\u7684\u5F52\u6863\u6587\u4EF6\n -v \u5728\u6807\u51C6\u8F93\u51FA\u4E2D\u751F\u6210\u8BE6\u7EC6\u8F93\u51FA\n -f \u6307\u5B9A\u5F52\u6863\u6587\u4EF6\u540D\n -m \u5305\u542B\u6307\u5B9A\u6E05\u5355\u6587\u4EF6\u4E2D\u7684\u6E05\u5355\u4FE1\u606F\n -e \u4E3A\u6346\u7ED1\u5230\u53EF\u6267\u884C jar \u6587\u4EF6\u7684\u72EC\u7ACB\u5E94\u7528\u7A0B\u5E8F\n \u6307\u5B9A\u5E94\u7528\u7A0B\u5E8F\u5165\u53E3\u70B9\n -0 \u4EC5\u5B58\u50A8; \u4E0D\u4F7F\u7528\u60C5\u51B5\u4EFB\u4F55 ZIP \u538B\u7F29\n -M \u4E0D\u521B\u5EFA\u6761\u76EE\u7684\u6E05\u5355\u6587\u4EF6\n -i \u4E3A\u6307\u5B9A\u7684 jar \u6587\u4EF6\u751F\u6210\u7D22\u5F15\u4FE1\u606F\n -C \u66F4\u6539\u4E3A\u6307\u5B9A\u7684\u76EE\u5F55\u5E76\u5305\u542B\u5176\u4E2D\u7684\u6587\u4EF6\n\u5982\u679C\u6709\u4EFB\u4F55\u76EE\u5F55\u6587\u4EF6, \u5219\u5BF9\u5176\u8FDB\u884C\u9012\u5F52\u5904\u7406\u3002\n\u6E05\u5355\u6587\u4EF6\u540D, \u5F52\u6863\u6587\u4EF6\u540D\u548C\u5165\u53E3\u70B9\u540D\u79F0\u7684\u6307\u5B9A\u987A\u5E8F\n\u4E0E 'm', 'f' \u548C 'e' \u6807\u8BB0\u7684\u6307\u5B9A\u987A\u5E8F\u76F8\u540C\u3002\n\n\u793A\u4F8B 1: \u5C06\u4E24\u4E2A\u7C7B\u6587\u4EF6\u5F52\u6863\u5230\u4E00\u4E2A\u540D\u4E3A classes.jar \u7684\u5F52\u6863\u6587\u4EF6\u4E2D: \n jar cvf classes.jar Foo.class Bar.class \n\u793A\u4F8B 2: \u4F7F\u7528\u73B0\u6709\u7684\u6E05\u5355\u6587\u4EF6 'mymanifest' \u5E76\n \u5C06 foo/ \u76EE\u5F55\u4E2D\u7684\u6240\u6709\u6587\u4EF6\u5F52\u6863\u5230 'classes.jar' \u4E2D: \n jar cvfm classes.jar mymanifest -C foo/ .\n --- ./jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties 2014-01-18 12:16:28.000000000 -0800 ++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar_zh_TW.properties 2014-07-15 23:24:36.000000000 -0700 @@ -41,7 +41,7 @@ out.stored=(\u5132\u5B58 0%) out.create=\ \u5EFA\u7ACB: {0} @@ -70843,7 +73388,7 @@ usage=\u7528\u6CD5: jar {ctxui}[vfm0Me] [jar-file] [manifest-file] [entry-point] [-C dir] \u6A94\u6848 ...\n\u9078\u9805:\n -c \u5EFA\u7ACB\u65B0\u7684\u6B78\u6A94\n -t \u5217\u51FA\u6B78\u6A94\u7684\u76EE\u9304\n -x \u5F9E\u6B78\u6A94\u4E2D\u64F7\u53D6\u5DF2\u547D\u540D\u7684 (\u6216\u6240\u6709) \u6A94\u6848\n -u \u66F4\u65B0\u73FE\u6709\u6B78\u6A94\n -v \u5728\u6A19\u6E96\u8F38\u51FA\u4E2D\u7522\u751F\u8A73\u7D30\u8F38\u51FA\n -f \u6307\u5B9A\u6B78\u6A94\u6A94\u6848\u540D\u7A31\n -m \u5305\u542B\u6307\u5B9A\u8CC7\u8A0A\u6E05\u55AE\u4E2D\u7684\u8CC7\u8A0A\u6E05\u55AE\u8CC7\u8A0A\n -e \u70BA\u7368\u7ACB\u61C9\u7528\u7A0B\u5F0F\u6307\u5B9A\u61C9\u7528\u7A0B\u5F0F\u9032\u5165\u9EDE\n \u5DF2\u96A8\u9644\u65BC\u53EF\u57F7\u884C jar \u6A94\u6848\u4E2D\n -0 \u50C5\u5132\u5B58; \u4E0D\u4F7F\u7528 ZIP \u58D3\u7E2E\u65B9\u5F0F\n -M \u4E0D\u70BA\u9805\u76EE\u5EFA\u7ACB\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848\n -i \u70BA\u6307\u5B9A\u7684 jar \u6A94\u6848\u7522\u751F\u7D22\u5F15\u8CC7\u8A0A\n -C \u8B8A\u66F4\u81F3\u6307\u5B9A\u76EE\u9304\u4E26\u5305\u542B\u5F8C\u9762\u6240\u5217\u7684\u6A94\u6848\n\u5982\u679C\u6709\u4EFB\u4F55\u6A94\u6848\u662F\u76EE\u9304\uFF0C\u5247\u6703\u5C0D\u5176\u9032\u884C\u905E\u8FF4\u8655\u7406\u3002\n\u6E05\u55AE\u6A94\u6848\u540D\u7A31\u3001\u6B78\u6A94\u6A94\u6848\u540D\u7A31\u548C\u9032\u5165\u9EDE\u540D\u7A31\n\u7684\u6307\u5B9A\u9806\u5E8F\u8207\u6307\u5B9A 'm' \u65D7\u6A19\u3001'f' \u65D7\u6A19\u548C 'e' \u65D7\u6A19\u7684\u9806\u5E8F\u76F8\u540C\u3002\n\n\u7BC4\u4F8B 1: \u5C07\u5169\u500B\u985E\u5225\u6A94\u6848\u6B78\u6A94\u81F3\u540D\u70BA classes.jar \u7684\u6B78\u6A94\u4E2D: \n jar cvf classes.jar Foo.class Bar.class\n\u7BC4\u4F8B 2: \u4F7F\u7528\u73FE\u6709\u8CC7\u8A0A\u6E05\u55AE\u6A94\u6848 'mymanifest' \u4E26\u5C07\n foo/ \u76EE\u9304\u4E2D\u7684\u6240\u6709\u6A94\u6848\u6B78\u6A94\u81F3 'classes.jar' \u4E2D: \n jar cvfm classes.jar mymanifest -C foo/ .\n --- ./jdk/src/share/classes/sun/tools/jconsole/Messages.java 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jconsole/Messages.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jconsole/Messages.java 2014-07-15 23:24:36.000000000 -0700 @@ -36,7 +36,7 @@ Resources.initializeMessages(Messages.class, BUNDLE_NAME); } @@ -70874,7 +73419,7 @@ public static String CONNECTING_TO2; public static String DEADLOCK_TAB; --- ./jdk/src/share/classes/sun/tools/jconsole/SummaryTab.java 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jconsole/SummaryTab.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jconsole/SummaryTab.java 2014-07-15 23:24:36.000000000 -0700 @@ -213,8 +213,8 @@ String[] strings2 = formatKByteStrings(u.getCommitted()); append(Messages.COMMITTED_MEMORY, strings2[0]); @@ -70887,7 +73432,7 @@ append(newTable); --- ./jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java 2013-09-06 11:28:49.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jconsole/ThreadTab.java 2014-07-15 23:24:36.000000000 -0700 @@ -66,9 +66,6 @@ private static final Border thinEmptyBorder = new EmptyBorder(2, 2, 2, 2); @@ -70908,7 +73453,7 @@ } } --- ./jdk/src/share/classes/sun/tools/jconsole/VMPanel.java 2013-09-06 11:28:50.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jconsole/VMPanel.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jconsole/VMPanel.java 2014-07-15 23:24:36.000000000 -0700 @@ -469,8 +469,8 @@ msgExplanation = Resources.format(Messages.CONNECTING_TO2, getConnectionName()); buttonStr = Messages.RECONNECT; @@ -70921,7 +73466,7 @@ } else { msgTitle = Messages.CONNECTION_FAILED1; --- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties 2013-09-06 11:28:50.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages.properties 2014-07-15 23:24:36.000000000 -0700 @@ -223,6 +223,7 @@ SUMMARY_TAB_TAB_NAME=VM Summary SUMMARY_TAB_VM_VERSION={0} version {1} @@ -70952,7 +73497,7 @@ CONNECTING_TO2=You are currently being connected to {0}.<br>This will take a few moments. DEADLOCK_TAB=Deadlock --- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties 2013-09-06 11:28:50.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_ja.properties 2014-07-15 23:24:36.000000000 -0700 @@ -52,7 +52,7 @@ CONNECT_DIALOG_STATUS_BAR_ACCESSIBLE_NAME=\u30B9\u30C6\u30FC\u30BF\u30B9\u30FB\u30D0\u30FC CONNECT_DIALOG_TITLE=JConsole: \u65B0\u898F\u63A5\u7D9A @@ -71027,7 +73572,7 @@ -ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n -interval \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n -notile \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u4E26\u3079\u3066\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n -version \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u5370\u5237\u3059\u308B\n\n connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n pid \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n host \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n port \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n -J JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B +ZZ_USAGE_TEXT=\u4F7F\u7528\u65B9\u6CD5: {0} [ -interval=n ] [ -notile ] [ -pluginpath <path> ] [ -version ] [ connection ... ]\n\n -interval \u66F4\u65B0\u9593\u9694\u3092n\u79D2\u306B\u8A2D\u5B9A\u3059\u308B(\u30C7\u30D5\u30A9\u30EB\u30C8\u306F4\u79D2)\n -notile \u30A6\u30A3\u30F3\u30C9\u30A6\u3092\u6700\u521D\u306B\u4E26\u3079\u3066\u8868\u793A\u3057\u306A\u3044(2\u3064\u4EE5\u4E0A\u306E\u63A5\u7D9A\u306B\u3064\u3044\u3066)\n -pluginpath JConsole\u304C\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u53C2\u7167\u3059\u308B\u305F\u3081\u306B\u4F7F\u7528\u3059\u308B\u30D1\u30B9\u3092\u6307\u5B9A\u3059\u308B\n -version \u30D7\u30ED\u30B0\u30E9\u30E0\u30FB\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u51FA\u529B\u3059\u308B\n\n connection = pid || host:port || JMX URL (service:jmx:<protocol>://...)\n pid \u30BF\u30FC\u30B2\u30C3\u30C8\u30FB\u30D7\u30ED\u30BB\u30B9\u306E\u30D7\u30ED\u30BB\u30B9ID\n host \u30EA\u30E2\u30FC\u30C8\u30FB\u30DB\u30B9\u30C8\u540D\u307E\u305F\u306FIP\u30A2\u30C9\u30EC\u30B9\n port \u30EA\u30E2\u30FC\u30C8\u63A5\u7D9A\u7528\u306E\u30DD\u30FC\u30C8\u756A\u53F7\n\n -J JConsole\u304C\u5B9F\u884C\u4E2D\u306EJava\u4EEE\u60F3\u30DE\u30B7\u30F3\u3078\u306E\n \u5165\u529B\u5F15\u6570\u3092\u6307\u5B9A\u3059\u308B --- ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties 2013-09-06 11:28:50.000000000 -0700 -+++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/tools/jconsole/resources/messages_zh_CN.properties 2014-07-15 23:24:36.000000000 -0700 @@ -161,7 +161,7 @@ MESSAGE=\u6D88\u606F METHOD_SUCCESSFULLY_INVOKED=\u5DF2\u6210\u529F\u8C03\u7528\u65B9\u6CD5 @@ -71072,7 +73617,7 @@ CONNECTING_TO1=\u6B63\u5728\u8FDE\u63A5\u5230{0} CONNECTING_TO2=\u60A8\u5F53\u524D\u6B63\u5728\u8FDE\u63A5\u5230{0}\u3002<br>\u8FD9\u5C06\u9700\u8981\u51E0\u5206\u949F\u7684\u65F6\u95F4\u3002 --- ./jdk/src/share/classes/sun/util/logging/resources/logging.properties 2013-09-06 11:28:51.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/logging/resources/logging.properties 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/logging/resources/logging.properties 2014-07-15 23:24:36.000000000 -0700 @@ -27,20 +27,20 @@ # these are the same as the non-localized level name. @@ -71104,7 +73649,7 @@ -OFF=OFF +OFF=Off --- ./jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties 2013-09-06 11:28:52.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/logging/resources/logging_zh_TW.properties 2014-07-15 23:24:36.000000000 -0700 @@ -27,7 +27,7 @@ # these are the same as the non-localized level name. @@ -71114,8 +73659,51 @@ # The following ALL CAPS words should be translated. SEVERE=\u56B4\u91CD # The following ALL CAPS words should be translated. +--- ./jdk/src/share/classes/sun/util/resources/CalendarData_pt_BR.properties 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/src/share/classes/sun/util/resources/CalendarData_pt_BR.properties 2014-07-15 23:24:36.000000000 -0700 +@@ -0,0 +1,40 @@ ++# ++# Copyright (c) 2014, 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. Oracle designates this ++# particular file as subject to the "Classpath" exception as provided ++# by Oracle in the LICENSE file that accompanied this code. ++# ++# 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 if you need additional information or have any ++# questions. ++# ++ ++# (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved ++# (C) Copyright IBM Corp. 1996 - 1999 - All Rights Reserved ++# ++# The original version of this source code and documentation ++# is copyrighted and owned by Taligent, Inc., a wholly-owned ++# subsidiary of IBM. These materials are provided under terms ++# of a License Agreement between Taligent and Sun. This technology ++# is protected by multiple US and International patents. ++# ++# This notice and attribution to Taligent may not be removed. ++# Taligent is a registered trademark of Taligent, Inc. ++ ++ ++firstDayOfWeek=1 ++minimalDaysInFirstWeek=1 --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. @@ -71252,7 +73840,7 @@ "Middle Europe Summer Time", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_de.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -71498,7 +74086,7 @@ "Zentraleurop\u00e4ische Sommerzeit", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_es.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -71712,7 +74300,7 @@ "Hora de verano de Europa Central", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_fr.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -71960,7 +74548,7 @@ "Heure d'\u00e9t\u00e9 de l'Europe centrale", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_it.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -72214,7 +74802,7 @@ "Ora estiva dell'Europa centrale", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ja.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -72478,7 +75066,7 @@ "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_ko.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -72742,7 +75330,7 @@ "\uc911\ubd80 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_pt_BR.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -73007,7 +75595,7 @@ "Fuso hor\u00e1rio de ver\u00e3o da Europa M\u00e9dia", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_sv.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -73269,7 +75857,7 @@ "Mellaneuropeisk sommartid", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_CN.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -73533,7 +76121,7 @@ "\u4e2d\u6b27\u590f\u4ee4\u65f6", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java 2013-09-06 11:28:53.000000000 -0700 -+++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/classes/sun/util/resources/TimeZoneNames_zh_TW.java 2014-07-15 23:24:36.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -73797,7 +76385,7 @@ "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "MEST"}}, {"Mexico/BajaNorte", PST}, --- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2013-09-06 11:28:55.000000000 -0700 -+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2014-07-15 23:24:37.000000000 -0700 @@ -38,6 +38,7 @@ # gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9] # gnumake JDK=<java_home> OSNAME=linux [OPT=true] @@ -73837,7 +76425,7 @@ CFLAGS += -I. CFLAGS += -I../agent_util --- ./jdk/src/share/demo/jvmti/hprof/hprof_class.c 2013-09-06 11:28:55.000000000 -0700 -+++ ./jdk/src/share/demo/jvmti/hprof/hprof_class.c 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/demo/jvmti/hprof/hprof_class.c 2014-07-15 23:24:37.000000000 -0700 @@ -527,7 +527,12 @@ jmethodID method; @@ -73867,7 +76455,7 @@ HPROF_ASSERT(sig!=NULL); clazz = class_get_class(env, index); --- ./jdk/src/share/demo/jvmti/hprof/hprof_event.c 2013-09-06 11:28:55.000000000 -0700 -+++ ./jdk/src/share/demo/jvmti/hprof/hprof_event.c 2013-12-01 11:14:27.000000000 -0800 ++++ ./jdk/src/share/demo/jvmti/hprof/hprof_event.c 2014-07-15 23:24:37.000000000 -0700 @@ -195,7 +195,12 @@ HPROF_ASSERT(env!=NULL); @@ -73924,7 +76512,7 @@ } } --- ./jdk/src/share/demo/jvmti/hprof/hprof_init.c 2013-09-06 11:28:55.000000000 -0700 -+++ ./jdk/src/share/demo/jvmti/hprof/hprof_init.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/demo/jvmti/hprof/hprof_init.c 2014-07-15 23:24:37.000000000 -0700 @@ -1899,11 +1899,17 @@ */ getSystemProperty("sun.boot.library.path", &boot_path); @@ -73954,7 +76542,7 @@ NPT_INITIALIZE(npt_lib, &(gdata->npt), NPT_VERSION, NULL); if ( gdata->npt == NULL ) { --- ./jdk/src/share/demo/jvmti/hprof/hprof_md.h 2013-09-06 11:28:55.000000000 -0700 -+++ ./jdk/src/share/demo/jvmti/hprof/hprof_md.h 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/demo/jvmti/hprof/hprof_md.h 2014-07-15 23:24:37.000000000 -0700 @@ -69,7 +69,7 @@ unsigned md_ntohs(unsigned short s); unsigned md_ntohl(unsigned l); @@ -73965,7 +76553,7 @@ void md_unload_library(void *handle); void * md_find_library_entry(void *handle, const char *name); --- ./jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java 2013-09-06 11:28:57.000000000 -0700 -+++ ./jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -73983,7 +76571,7 @@ private static final long serialVersionUID = 4116273141148726319L; --- ./jdk/src/share/lib/security/java.policy 2013-09-06 11:28:57.000000000 -0700 -+++ ./jdk/src/share/lib/security/java.policy 2014-01-18 12:16:29.000000000 -0800 ++++ ./jdk/src/share/lib/security/java.policy 2014-07-15 23:24:37.000000000 -0700 @@ -2,48 +2,51 @@ // Standard extensions get all permissions by default @@ -74072,7 +76660,7 @@ }; --- ./jdk/src/share/lib/security/java.security-linux 2013-09-06 11:28:57.000000000 -0700 -+++ ./jdk/src/share/lib/security/java.security-linux 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/lib/security/java.security-linux 2014-07-15 23:24:37.000000000 -0700 @@ -128,7 +128,10 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ @@ -74101,7 +76689,7 @@ # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048 - --- ./jdk/src/share/lib/security/java.security-macosx 2013-09-06 11:28:57.000000000 -0700 -+++ ./jdk/src/share/lib/security/java.security-macosx 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/lib/security/java.security-macosx 2014-07-15 23:24:37.000000000 -0700 @@ -129,7 +129,10 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ @@ -74130,7 +76718,7 @@ # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048 - --- ./jdk/src/share/lib/security/java.security-solaris 2013-09-06 11:28:57.000000000 -0700 -+++ ./jdk/src/share/lib/security/java.security-solaris 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/lib/security/java.security-solaris 2014-07-15 23:24:37.000000000 -0700 @@ -130,7 +130,10 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ @@ -74159,7 +76747,7 @@ # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048 -i --- ./jdk/src/share/lib/security/java.security-windows 2013-09-06 11:28:57.000000000 -0700 -+++ ./jdk/src/share/lib/security/java.security-windows 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/lib/security/java.security-windows 2014-07-15 23:24:37.000000000 -0700 @@ -129,7 +129,10 @@ com.sun.imageio.,\ com.sun.istack.internal.,\ @@ -74187,8 +76775,229 @@ # Example: # jdk.tls.disabledAlgorithms=MD5, SHA1, DSA, RSA keySize < 2048 - +--- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2013-09-06 11:28:57.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2014-07-15 23:24:37.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2001, 2014, 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 +@@ -79,6 +79,7 @@ + #define ERROR_RESOURCE "Cannot extract resource file" + #define ERROR_OVERFLOW "Internal buffer overflow" + #define ERROR_INTERNAL "Internal error" ++#define ERROR_INIT "cannot init class members" + + #define LOGFILE_STDOUT "-" + #define LOGFILE_STDERR "" +--- ./jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp 2013-09-06 11:28:57.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp 2014-07-15 23:24:37.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2003, 2014, 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 +@@ -56,6 +56,45 @@ + + #define THROW_IOE(x) JNU_ThrowIOException(env,x) + ++#define CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(CERVTI_exception, CERVTI_message) \ ++ do { \ ++ if ((env)->ExceptionOccurred()) { \ ++ THROW_IOE(CERVTI_message); \ ++ return; \ ++ } \ ++ if ((CERVTI_exception) == NULL) { \ ++ THROW_IOE(CERVTI_message); \ ++ return; \ ++ } \ ++ } while (JNI_FALSE) ++ ++ ++#define CHECK_EXCEPTION_RETURN_VALUE(CERL_exception, CERL_return_value) \ ++ do { \ ++ if ((env)->ExceptionOccurred()) { \ ++ return CERL_return_value; \ ++ } \ ++ if ((CERL_exception) == NULL) { \ ++ return CERL_return_value; \ ++ } \ ++ } while (JNI_FALSE) ++ ++ ++// If these useful macros aren't defined in jni_util.h then define them here ++#ifndef CHECK_NULL_RETURN ++#define CHECK_NULL_RETURN(x, y) \ ++ do { \ ++ if ((x) == NULL) return (y); \ ++ } while (JNI_FALSE) ++#endif ++ ++#ifndef CHECK_EXCEPTION_RETURN ++#define CHECK_EXCEPTION_RETURN(env, y) \ ++ do { \ ++ if ((*env)->ExceptionCheck(env)) return (y); \ ++ } while (JNI_FALSE) ++#endif ++ + static jlong read_input_via_jni(unpacker* self, + void* buf, jlong minlen, jlong maxlen); + +@@ -92,9 +131,11 @@ + vm->GetEnv(&envRaw, JNI_VERSION_1_1); + JNIEnv* env = (JNIEnv*) envRaw; + //fprintf(stderr, "get_unpacker() env=%p\n", env); +- if (env == null) +- return null; ++ CHECK_NULL_RETURN(env, NULL); + jobject pObj = env->CallStaticObjectMethod(NIclazz, currentInstMID); ++ // We should check upon the known non-null variable because here we want to check ++ // only for pending exceptions. If pObj is null we'll deal with it later. ++ CHECK_EXCEPTION_RETURN_VALUE(env, NULL); + //fprintf(stderr, "get_unpacker0() pObj=%p\n", pObj); + if (pObj != null) { + // Got pObj and env; now do it the easy way. +@@ -137,20 +178,20 @@ + while( dbg != null) { sleep(10); } + #endif + NIclazz = (jclass) env->NewGlobalRef(clazz); ++ + unpackerPtrFID = env->GetFieldID(clazz, "unpackerPtr", "J"); ++ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(unpackerPtrFID, ERROR_INIT); ++ + currentInstMID = env->GetStaticMethodID(clazz, "currentInstance", + "()Ljava/lang/Object;"); ++ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(currentInstMID, ERROR_INIT); ++ + readInputMID = env->GetMethodID(clazz, "readInputFn", + "(Ljava/nio/ByteBuffer;J)J"); +- getUnpackerPtrMID = env->GetMethodID(clazz, "getUnpackerPtr", "()J"); ++ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(readInputMID, ERROR_INIT); + +- if (unpackerPtrFID == null || +- currentInstMID == null || +- readInputMID == null || +- NIclazz == null || +- getUnpackerPtrMID == null) { +- THROW_IOE("cannot init class members"); +- } ++ getUnpackerPtrMID = env->GetMethodID(clazz, "getUnpackerPtr", "()J"); ++ CHECK_EXCEPTION_RETURN_VOID_THROW_IOE(getUnpackerPtrMID, ERROR_INIT); + } + + JNIEXPORT jlong JNICALL +@@ -160,9 +201,7 @@ + // valid object pointers and env is intact, if not now is good time to bail. + unpacker* uPtr = get_unpacker(); + //fprintf(stderr, "start(%p) uPtr=%p initializing\n", pObj, uPtr); +- if (uPtr == null) { +- return -1; +- } ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, -1); + // redirect our io to the default log file or whatever. + uPtr->redirect_stdio(); + +@@ -200,6 +239,7 @@ + jobjectArray pParts) { + + unpacker* uPtr = get_unpacker(env, pObj); ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false); + unpacker::file* filep = uPtr->get_next_file(); + + if (uPtr->aborting()) { +@@ -207,32 +247,38 @@ + return false; + } + +- if (filep == null) { +- return false; // end of the sequence +- } ++ CHECK_NULL_RETURN(filep, false); + assert(filep == &uPtr->cur_file); + + int pidx = 0, iidx = 0; + jintArray pIntParts = (jintArray) env->GetObjectArrayElement(pParts, pidx++); ++ CHECK_EXCEPTION_RETURN_VALUE(pIntParts, false); + jint* intParts = env->GetIntArrayElements(pIntParts, null); + intParts[iidx++] = (jint)( (julong)filep->size >> 32 ); + intParts[iidx++] = (jint)( (julong)filep->size >> 0 ); + intParts[iidx++] = filep->modtime; + intParts[iidx++] = filep->deflate_hint() ? 1 : 0; + env->ReleaseIntArrayElements(pIntParts, intParts, JNI_COMMIT); +- +- env->SetObjectArrayElement(pParts, pidx++, env->NewStringUTF(filep->name)); +- ++ jstring filename = env->NewStringUTF(filep->name); ++ CHECK_EXCEPTION_RETURN_VALUE(filename, false); ++ env->SetObjectArrayElement(pParts, pidx++, filename); ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false); + jobject pDataBuf = null; +- if (filep->data[0].len > 0) ++ if (filep->data[0].len > 0) { + pDataBuf = env->NewDirectByteBuffer(filep->data[0].ptr, + filep->data[0].len); ++ CHECK_EXCEPTION_RETURN_VALUE(pDataBuf, false); ++ } + env->SetObjectArrayElement(pParts, pidx++, pDataBuf); ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false); + pDataBuf = null; +- if (filep->data[1].len > 0) ++ if (filep->data[1].len > 0) { + pDataBuf = env->NewDirectByteBuffer(filep->data[1].ptr, + filep->data[1].len); ++ CHECK_EXCEPTION_RETURN_VALUE(pDataBuf, false); ++ } + env->SetObjectArrayElement(pParts, pidx++, pDataBuf); ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, false); + + return true; + } +@@ -241,6 +287,7 @@ + JNIEXPORT jobject JNICALL + Java_com_sun_java_util_jar_pack_NativeUnpack_getUnusedInput(JNIEnv *env, jobject pObj) { + unpacker* uPtr = get_unpacker(env, pObj); ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL); + unpacker::file* filep = &uPtr->cur_file; + + if (uPtr->aborting()) { +@@ -263,7 +310,7 @@ + JNIEXPORT jlong JNICALL + Java_com_sun_java_util_jar_pack_NativeUnpack_finish(JNIEnv *env, jobject pObj) { + unpacker* uPtr = get_unpacker(env, pObj, false); +- if (uPtr == null) return 0; ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL); + size_t consumed = uPtr->input_consumed(); + free_unpacker(env, pObj, uPtr); + return consumed; +@@ -274,7 +321,9 @@ + jstring pProp, jstring pValue) { + unpacker* uPtr = get_unpacker(env, pObj); + const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE); ++ CHECK_EXCEPTION_RETURN_VALUE(prop, false); + const char* value = env->GetStringUTFChars(pValue, JNI_FALSE); ++ CHECK_EXCEPTION_RETURN_VALUE(value, false); + jboolean retval = uPtr->set_option(prop, value); + env->ReleaseStringUTFChars(pProp, prop); + env->ReleaseStringUTFChars(pValue, value); +@@ -286,9 +335,11 @@ + jstring pProp) { + + unpacker* uPtr = get_unpacker(env, pObj); ++ CHECK_EXCEPTION_RETURN_VALUE(uPtr, NULL); + const char* prop = env->GetStringUTFChars(pProp, JNI_FALSE); ++ CHECK_EXCEPTION_RETURN_VALUE(prop, NULL); + const char* value = uPtr->get_option(prop); ++ CHECK_EXCEPTION_RETURN_VALUE(value, NULL); + env->ReleaseStringUTFChars(pProp, prop); +- if (value == null) return null; + return env->NewStringUTF(value); + } --- ./jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp 2013-09-06 11:28:57.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp 2014-04-19 01:27:15.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. @@ -74238,7 +77047,7 @@ // (Do not use stdout, since it might be jarout->jarfp.) errstrm = stderr; --- ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2013-09-06 11:28:57.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved. @@ -74276,7 +77085,7 @@ zs.next_in = (uchar*)head.ptr; --- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2013-09-06 11:28:58.000000000 -0700 -+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2014-07-15 23:24:37.000000000 -0700 @@ -64,7 +64,7 @@ @@ -74287,7 +77096,7 @@ #endif --- ./jdk/src/share/native/common/check_code.c 2013-09-06 11:28:58.000000000 -0700 -+++ ./jdk/src/share/native/common/check_code.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/common/check_code.c 2014-07-15 23:24:37.000000000 -0700 @@ -90,6 +90,12 @@ #include "classfile_constants.h" #include "opcodes.in_out" @@ -74302,7 +77111,7 @@ /* align byte code */ #ifndef ALIGN_UP --- ./jdk/src/share/native/java/lang/Class.c 2013-09-06 11:28:58.000000000 -0700 -+++ ./jdk/src/share/native/java/lang/Class.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/share/native/java/lang/Class.c 2014-07-15 23:24:37.000000000 -0700 @@ -70,7 +70,7 @@ {"getProtectionDomain0", "()" PD, (void *)&JVM_GetProtectionDomain}, {"setProtectionDomain0", "(" PD ")V", (void *)&JVM_SetProtectionDomain}, @@ -74330,7 +77139,7 @@ +} + --- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2013-09-06 11:28:58.000000000 -0700 -+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2014-07-15 23:24:37.000000000 -0700 @@ -24,6 +24,9 @@ * questions. */ @@ -74400,7 +77209,7 @@ - (*env)->CallVoidMethod(env, ob, mid); -} --- ./jdk/src/share/native/java/net/Inet6Address.c 2013-09-06 11:28:58.000000000 -0700 -+++ ./jdk/src/share/native/java/net/Inet6Address.c 2013-12-01 11:14:28.000000000 -0800 ++++ ./jdk/src/share/native/java/net/Inet6Address.c 2014-07-15 23:24:37.000000000 -0700 @@ -33,6 +33,8 @@ */ @@ -74443,7 +77252,7 @@ ia6_ctrID = (*env)->GetMethodID(env, ia6_class, "<init>", "()V"); CHECK_NULL(ia6_ctrID); --- ./jdk/src/share/native/java/net/net_util.c 2013-09-06 11:28:58.000000000 -0700 -+++ ./jdk/src/share/native/java/net/net_util.c 2013-12-01 11:14:28.000000000 -0800 ++++ ./jdk/src/share/native/java/net/net_util.c 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. @@ -74606,7 +77415,7 @@ return JNI_TRUE; } else { --- ./jdk/src/share/native/java/net/net_util.h 2013-09-06 11:28:58.000000000 -0700 -+++ ./jdk/src/share/native/java/net/net_util.h 2013-12-01 11:14:28.000000000 -0800 ++++ ./jdk/src/share/native/java/net/net_util.h 2014-07-15 23:24:37.000000000 -0700 @@ -58,6 +58,22 @@ extern jfieldID iac_hostNameID; extern jfieldID ia_preferIPv6AddressID; @@ -74639,7 +77448,7 @@ extern jfieldID ia6_scopeidID; extern jfieldID ia6_cachedscopeidID; --- ./jdk/src/share/native/sun/awt/giflib/dgif_lib.c 2013-09-06 11:28:59.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/giflib/dgif_lib.c 2014-04-19 01:27:15.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/giflib/dgif_lib.c 2014-07-15 23:24:37.000000000 -0700 @@ -435,9 +435,7 @@ Private->PixelCount = (long)GifFile->Image.Width * (long)GifFile->Image.Height; @@ -74652,7 +77461,7 @@ /****************************************************************************** --- ./jdk/src/share/native/sun/awt/image/awt_parseImage.c 2013-09-06 11:28:59.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c 2013-12-01 11:14:29.000000000 -0800 ++++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.c 2014-07-15 23:24:37.000000000 -0700 @@ -808,363 +808,204 @@ return 1; } @@ -75144,7 +77953,7 @@ + return 1; } --- ./jdk/src/share/native/sun/awt/image/awt_parseImage.h 2013-09-06 11:28:59.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.h 2013-12-01 11:14:29.000000000 -0800 ++++ ./jdk/src/share/native/sun/awt/image/awt_parseImage.h 2014-07-15 23:24:37.000000000 -0700 @@ -188,13 +188,8 @@ void awt_freeParsedImage(BufImageS_t *imageP, int freeImageP); @@ -75163,7 +77972,7 @@ #endif /* AWT_PARSE_IMAGE_H */ --- ./jdk/src/share/native/sun/awt/image/gif/gifdecoder.c 2013-09-06 11:28:59.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/image/gif/gifdecoder.c 2014-04-19 01:27:15.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/image/gif/gifdecoder.c 2014-07-15 23:24:37.000000000 -0700 @@ -249,6 +249,7 @@ /* fill the block */ len = (*env)->CallIntMethod(env, this, readID, @@ -75173,7 +77982,7 @@ return 0; } --- ./jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2013-09-06 11:28:59.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-04-19 01:27:15.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c 2014-07-15 23:24:37.000000000 -0700 @@ -930,14 +930,18 @@ * Now fill a complete buffer, or as much of one as the stream * will give us if we are near the end. @@ -75270,7 +78079,7 @@ if (scale == NULL) { scale = (UINT8**) calloc(numBands, sizeof(UINT8*)); --- ./jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2013-09-06 11:28:59.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2014-04-19 01:27:15.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/image/jpeg/jdmarker.c 2014-07-15 23:24:37.000000000 -0700 @@ -349,6 +349,12 @@ TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc, @@ -75285,7 +78094,7 @@ /* Collect the additional scan parameters Ss, Se, Ah/Al. */ --- ./jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2014-04-19 01:27:15.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/image/jpeg/jpegdecoder.c 2014-07-15 23:24:37.000000000 -0700 @@ -289,6 +289,7 @@ buflen = (*env)->GetArrayLength(env, src->hInputBuffer); ret = (*env)->CallIntMethod(env, src->hInputStream, InputStream_readID, @@ -75311,7 +78120,7 @@ cinfo->err->error_exit((struct jpeg_common_struct *) cinfo); } --- ./jdk/src/share/native/sun/awt/libpng/pngrtran.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/libpng/pngrtran.c 2014-04-19 01:27:15.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/libpng/pngrtran.c 2014-07-15 23:24:37.000000000 -0700 @@ -1862,6 +1862,9 @@ info_ptr->bit_depth = 8; @@ -75323,7 +78132,7 @@ else { --- ./jdk/src/share/native/sun/awt/libpng/pngset.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/libpng/pngset.c 2014-04-19 01:27:15.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/libpng/pngset.c 2014-07-15 23:24:37.000000000 -0700 @@ -512,6 +512,17 @@ } } @@ -75343,7 +78152,14 @@ * we do it for backward compatibility with the way the png_handle_tRNS * function used to do the allocation. --- ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c 2014-04-19 01:27:15.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c 2014-07-15 23:24:37.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 1997, 2014, 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 @@ -228,6 +228,49 @@ } } @@ -75394,6 +78210,41 @@ /*************************************************************************** * External Functions * ***************************************************************************/ +@@ -330,14 +373,14 @@ + + + /* Parse the source image */ +- if ((status = awt_parseImage(env, jsrc, &srcImageP, FALSE)) <= 0) { ++ if (awt_parseImage(env, jsrc, &srcImageP, FALSE) <= 0) { + /* Can't handle any custom images */ + free(dkern); + return 0; + } + + /* Parse the destination image */ +- if ((status = awt_parseImage(env, jdst, &dstImageP, FALSE)) <= 0) { ++ if (awt_parseImage(env, jdst, &dstImageP, FALSE) <= 0) { + /* Can't handle any custom images */ + awt_freeParsedImage(srcImageP, TRUE); + free(dkern); +@@ -584,7 +627,7 @@ + } + + /* Parse the source raster */ +- if ((status = awt_parseRaster(env, jsrc, srcRasterP)) <= 0) { ++ if (awt_parseRaster(env, jsrc, srcRasterP) <= 0) { + /* Can't handle any custom rasters */ + free(srcRasterP); + free(dstRasterP); +@@ -593,7 +636,7 @@ + } + + /* Parse the destination raster */ +- if ((status = awt_parseRaster(env, jdst, dstRasterP)) <= 0) { ++ if (awt_parseRaster(env, jdst, dstRasterP) <= 0) { + /* Can't handle any custom images */ + awt_freeParsedRaster(srcRasterP, TRUE); + free(dstRasterP); @@ -700,21 +743,8 @@ /* Means that we couldn't write directly into the destination buffer */ @@ -75418,6 +78269,40 @@ } } +@@ -809,13 +839,13 @@ + (*env)->ReleasePrimitiveArrayCritical(env, jmatrix, matrix, JNI_ABORT); + + /* Parse the source image */ +- if ((status = awt_parseImage(env, jsrc, &srcImageP, FALSE)) <= 0) { ++ if (awt_parseImage(env, jsrc, &srcImageP, FALSE) <= 0) { + /* Can't handle any custom images */ + return 0; + } + + /* Parse the destination image */ +- if ((status = awt_parseImage(env, jdst, &dstImageP, FALSE)) <= 0) { ++ if (awt_parseImage(env, jdst, &dstImageP, FALSE) <= 0) { + /* Can't handle any custom images */ + awt_freeParsedImage(srcImageP, TRUE); + return 0; +@@ -1029,7 +1059,7 @@ + (*env)->ReleasePrimitiveArrayCritical(env, jmatrix, matrix, JNI_ABORT); + + /* Parse the source raster */ +- if ((status = awt_parseRaster(env, jsrc, srcRasterP)) <= 0) { ++ if (awt_parseRaster(env, jsrc, srcRasterP) <= 0) { + /* Can't handle any custom rasters */ + free(srcRasterP); + free(dstRasterP); +@@ -1037,7 +1067,7 @@ + } + + /* Parse the destination raster */ +- if ((status = awt_parseRaster(env, jdst, dstRasterP)) <= 0) { ++ if (awt_parseRaster(env, jdst, dstRasterP) <= 0) { + /* Can't handle any custom images */ + awt_freeParsedRaster(srcRasterP, TRUE); + free(dstRasterP); @@ -1119,24 +1149,9 @@ /* Means that we couldn't write directly into the destination buffer */ @@ -75444,6 +78329,22 @@ } } +@@ -1290,13 +1305,13 @@ + if (s_timeIt) (*start_timer)(3600); + + /* Parse the source image */ +- if ((status = awt_parseImage(env, jsrc, &srcImageP, FALSE)) <= 0) { ++ if (awt_parseImage(env, jsrc, &srcImageP, FALSE) <= 0) { + /* Can't handle any custom images */ + return 0; + } + + /* Parse the destination image */ +- if ((status = awt_parseImage(env, jdst, &dstImageP, FALSE)) <= 0) { ++ if (awt_parseImage(env, jdst, &dstImageP, FALSE) <= 0) { + /* Can't handle any custom images */ + awt_freeParsedImage(srcImageP, TRUE); + return 0; @@ -1462,6 +1477,14 @@ retStatus = 0; } @@ -75473,6 +78374,23 @@ /* Release the pinned memory */ freeArray(env, srcImageP, src, sdata, dstImageP, dst, ddata); +@@ -1537,14 +1553,14 @@ + } + + /* Parse the source raster - reject custom images */ +- if ((status = awt_parseRaster(env, jsrc, srcRasterP)) <= 0) { ++ if (awt_parseRaster(env, jsrc, srcRasterP) <= 0) { + free(srcRasterP); + free(dstRasterP); + return 0; + } + + /* Parse the destination image - reject custom images */ +- if ((status = awt_parseRaster(env, jdst, dstRasterP)) <= 0) { ++ if (awt_parseRaster(env, jdst, dstRasterP) <= 0) { + awt_freeParsedRaster(srcRasterP, TRUE); + free(dstRasterP); + return 0; @@ -1699,34 +1715,22 @@ retStatus = 0; } @@ -75772,7 +78690,7 @@ } else { --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2014-07-15 23:24:37.000000000 -0700 @@ -86,7 +86,7 @@ #endif /* MLIB_USE_FTOI_CLAMPING */ @@ -75813,7 +78731,7 @@ #endif /* _NO_LONGLONG */ --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2014-07-15 23:24:37.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -75854,7 +78772,7 @@ /***************************************************************/ --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2014-07-15 23:24:37.000000000 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -75895,7 +78813,7 @@ /***************************************************************/ --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2014-07-15 23:24:37.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -75936,7 +78854,7 @@ /***************************************************************/ --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2014-07-15 23:24:37.000000000 -0700 @@ -95,7 +95,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -75977,7 +78895,7 @@ /***************************************************************/ --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2014-07-15 23:24:37.000000000 -0700 @@ -126,7 +126,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -76018,7 +78936,7 @@ /***************************************************************/ --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2014-07-15 23:24:37.000000000 -0700 @@ -94,7 +94,7 @@ #define D2I(x) CLAMP_S32((x) SAT_OFF) @@ -76059,7 +78977,7 @@ /***************************************************************/ --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2014-07-15 23:24:37.000000000 -0700 @@ -95,7 +95,7 @@ dst = dp[0]; if (ld_offset + size < 32) { @@ -76280,7 +79198,7 @@ #else /* _LONGLONG */ --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2014-07-15 23:24:37.000000000 -0700 @@ -168,7 +168,7 @@ } @@ -76562,7 +79480,7 @@ dp[13] = t1; dp[14] = t2; --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2014-07-15 23:24:37.000000000 -0700 @@ -88,7 +88,7 @@ } d64_2_f32; @@ -76715,7 +79633,7 @@ ((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l; ((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h; --- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2014-07-15 23:24:37.000000000 -0700 @@ -30,7 +30,7 @@ typedef union { mlib_d64 db; @@ -76726,7 +79644,7 @@ #else mlib_s32 int0, int1; --- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2013-09-06 11:29:00.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2014-07-15 23:24:37.000000000 -0700 @@ -275,11 +275,11 @@ for (i = 0; j <= (b_size - 4); j += 4, i++) { src0 = src1; @@ -76826,7 +79744,7 @@ dp += SIZE; sp += SIZE; --- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2014-07-15 23:24:37.000000000 -0700 @@ -120,7 +120,7 @@ } \ } @@ -78060,7 +80978,7 @@ dp[13] = t1; dp[14] = t2; --- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2014-07-15 23:24:37.000000000 -0700 @@ -27,9 +27,21 @@ #ifndef MLIB_IMAGE_H #define MLIB_IMAGE_H @@ -78085,7 +81003,7 @@ #include <mlib_status.h> #include <mlib_sys.h> --- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2014-07-15 23:24:37.000000000 -0700 @@ -26,7 +26,7 @@ #include <stdlib.h> @@ -78108,7 +81026,7 @@ #else return (void *) memalign(8, size); --- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2014-07-15 23:24:37.000000000 -0700 @@ -59,7 +59,7 @@ #if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__) @@ -78119,7 +81037,7 @@ #include <stdint.h> /* for uintptr_t */ #elif defined(__linux__) --- ./jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/awt/splashscreen/splashscreen_impl.c 2014-07-15 23:24:37.000000000 -0700 @@ -111,8 +111,9 @@ int SplashIsStillLooping(Splash * splash) @@ -78190,8 +81108,57 @@ i0 = i; while (i < pSrcRect->numSamples && getRGBA(pSrc, pSrcRect->format) >= ALPHA_THRESHOLD) { +--- ./jdk/src/share/native/sun/font/freetypeScaler.c 2013-09-06 11:29:01.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/freetypeScaler.c 2014-07-15 23:24:37.000000000 -0700 +@@ -177,18 +177,10 @@ + if (numBytes > FILEDATACACHESIZE) { + bBuffer = (*env)->NewDirectByteBuffer(env, destBuffer, numBytes); + if (bBuffer != NULL) { +- /* Loop until the read succeeds (or EOF). +- * This should improve robustness in the event of a problem in +- * the I/O system. If we find that we ever end up spinning here +- * we are going to have to do some serious work to recover. +- * Just returning without reading the data will cause a crash. +- */ +- while (bread == 0) { +- bread = (*env)->CallIntMethod(env, +- scalerInfo->font2D, +- sunFontIDs.ttReadBlockMID, +- bBuffer, offset, numBytes); +- } ++ bread = (*env)->CallIntMethod(env, ++ scalerInfo->font2D, ++ sunFontIDs.ttReadBlockMID, ++ bBuffer, offset, numBytes); + return bread; + } else { + /* We probably hit bug bug 4845371. For reasons that +@@ -224,19 +216,10 @@ + (offset + FILEDATACACHESIZE > scalerInfo->fileSize) ? + scalerInfo->fileSize - offset : FILEDATACACHESIZE; + bBuffer = scalerInfo->directBuffer; +- /* Loop until all the read succeeds (or EOF). +- * This should improve robustness in the event of a problem in +- * the I/O system. If we find that we ever end up spinning here +- * we are going to have to do some serious work to recover. +- * Just returning without reading the data will cause a crash. +- */ +- while (bread == 0) { +- bread = (*env)->CallIntMethod(env, scalerInfo->font2D, +- sunFontIDs.ttReadBlockMID, +- bBuffer, offset, +- scalerInfo->fontDataLength); +- } +- ++ bread = (*env)->CallIntMethod(env, scalerInfo->font2D, ++ sunFontIDs.ttReadBlockMID, ++ bBuffer, offset, ++ scalerInfo->fontDataLength); + memcpy(destBuffer, scalerInfo->fontData, numBytes); + return numBytes; + } --- ./jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/AlternateSubstSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -55,7 +55,7 @@ (const AlternateSetTable *) ((char *) this + alternateSetTableOffset)); TTGlyphID alternate = SWAPW(alternateSetTable->alternateArray[0]); @@ -78202,7 +81169,7 @@ } --- ./jdk/src/share/native/sun/font/layout/AnchorTables.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/AnchorTables.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/AnchorTables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -37,55 +37,54 @@ U_NAMESPACE_BEGIN @@ -78306,7 +81273,7 @@ pixels.fY += adjy; } --- ./jdk/src/share/native/sun/font/layout/AnchorTables.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/AnchorTables.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/AnchorTables.h 2014-07-15 23:24:37.000000000 -0700 @@ -49,20 +49,23 @@ le_int16 xCoordinate; le_int16 yCoordinate; @@ -78347,7 +81314,7 @@ U_NAMESPACE_END --- ./jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ArabicLayoutEngine.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -51,7 +51,7 @@ U_NAMESPACE_BEGIN @@ -78380,7 +81347,7 @@ } --- ./jdk/src/share/native/sun/font/layout/ArabicShaping.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ArabicShaping.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ArabicShaping.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -59,7 +59,8 @@ ArabicShaping::ShapeType ArabicShaping::getShapeType(LEUnicode c) { @@ -78392,7 +81359,7 @@ le_int32 joiningType = joiningTypes->getGlyphClass(joiningTypes, c, success); --- ./jdk/src/share/native/sun/font/layout/CanonShaping.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/CanonShaping.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/CanonShaping.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -60,7 +60,7 @@ LEUnicode *outChars, LEGlyphStorage &glyphStorage) { @@ -78403,7 +81370,7 @@ le_int32 *combiningClasses = LE_NEW_ARRAY(le_int32, charCount); le_int32 *indices = LE_NEW_ARRAY(le_int32, charCount); --- ./jdk/src/share/native/sun/font/layout/CharSubstitutionFilter.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/CharSubstitutionFilter.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/CharSubstitutionFilter.h 2014-07-15 23:24:37.000000000 -0700 @@ -43,6 +43,8 @@ * This filter is used by character-based GSUB processors. It * accepts only those characters which the given font can display. @@ -78423,7 +81390,7 @@ U_NAMESPACE_END --- ./jdk/src/share/native/sun/font/layout/ClassDefinitionTables.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ClassDefinitionTables.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ClassDefinitionTables.h 2014-07-15 23:24:37.000000000 -0700 @@ -49,6 +49,7 @@ le_int32 getGlyphClass(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const; le_bool hasGlyphClass(const LETableReference &base, le_int32 glyphClass, LEErrorCode &success) const; @@ -78441,7 +81408,7 @@ struct ClassDefFormat1Table : ClassDefinitionTable --- ./jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/layout/ContextualGlyphSubstProc2.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -154,6 +154,7 @@ TTGlyphID glyphCode = (TTGlyphID) LE_GET_GLYPH(gid); if ((glyphCode >= firstGlyph) && (glyphCode < lastGlyph)) { @@ -78451,7 +81418,7 @@ } } --- ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -48,7 +48,7 @@ */ void ContextualSubstitutionBase::applySubstitutionLookups( @@ -78974,7 +81941,7 @@ ContextualSubstitutionBase::applySubstitutionLookups(lookupProcessor, substLookupRecordArray, substCount, glyphIterator, fontInstance, position, success); --- ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ContextualSubstSubtables.h 2014-07-15 23:24:37.000000000 -0700 @@ -56,20 +56,32 @@ struct ContextualSubstitutionBase : GlyphSubstitutionSubtable { @@ -79091,7 +82058,7 @@ LE_VAR_ARRAY(ChainingContextualSubstitutionFormat3Subtable, backtrackCoverageTableOffsetArray) --- ./jdk/src/share/native/sun/font/layout/CoverageTables.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/CoverageTables.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/CoverageTables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -37,8 +37,10 @@ U_NAMESPACE_BEGIN @@ -79171,7 +82138,7 @@ } --- ./jdk/src/share/native/sun/font/layout/CoverageTables.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/CoverageTables.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/CoverageTables.h 2014-07-15 23:24:37.000000000 -0700 @@ -46,7 +46,7 @@ { le_uint16 coverageFormat; @@ -79200,7 +82167,7 @@ LE_VAR_ARRAY(CoverageFormat2Table, rangeRecordArray) --- ./jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -51,23 +51,27 @@ } @@ -79235,7 +82202,7 @@ //glyphIterator->clearCursiveExitPoint(); } --- ./jdk/src/share/native/sun/font/layout/DeviceTables.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/DeviceTables.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/DeviceTables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -43,7 +43,7 @@ #define FORMAT_COUNT LE_ARRAY_SIZE(fieldBits) @@ -79260,7 +82227,7 @@ le_uint16 fieldIndex = sizeIndex % count; le_uint16 shift = 16 - (bits * (fieldIndex + 1)); --- ./jdk/src/share/native/sun/font/layout/DeviceTables.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/DeviceTables.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/DeviceTables.h 2014-07-15 23:24:37.000000000 -0700 @@ -50,7 +50,7 @@ le_uint16 deltaFormat; le_uint16 deltaValues[ANY_NUMBER]; @@ -79271,7 +82238,7 @@ private: static const le_uint16 fieldMasks[]; --- ./jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ExtensionSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -48,7 +48,6 @@ const LookupProcessor *lookupProcessor, le_uint16 lookupType, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const @@ -79281,7 +82248,7 @@ return 0; } --- ./jdk/src/share/native/sun/font/layout/ExtensionSubtables.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ExtensionSubtables.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ExtensionSubtables.h 2014-07-15 23:24:37.000000000 -0700 @@ -52,8 +52,7 @@ le_uint16 extensionLookupType; le_uint32 extensionOffset; @@ -79293,7 +82260,7 @@ }; --- ./jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/GDEFMarkFilter.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -49,9 +49,9 @@ // nothing to do? } @@ -79307,7 +82274,7 @@ return glyphClass == gcdMarkGlyph; } --- ./jdk/src/share/native/sun/font/layout/GDEFMarkFilter.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/GDEFMarkFilter.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/GDEFMarkFilter.h 2014-07-15 23:24:37.000000000 -0700 @@ -55,7 +55,7 @@ GDEFMarkFilter(const LEReferenceTo<GlyphDefinitionTableHeader> &gdefTable, LEErrorCode &success); virtual ~GDEFMarkFilter(); @@ -79318,7 +82285,7 @@ U_NAMESPACE_END --- ./jdk/src/share/native/sun/font/layout/GlyphIterator.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/GlyphIterator.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/GlyphIterator.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -41,14 +41,13 @@ U_NAMESPACE_BEGIN @@ -79467,7 +82434,7 @@ le_bool GlyphIterator::hasFeatureTag(le_bool matchGroup) const --- ./jdk/src/share/native/sun/font/layout/GlyphIterator.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/GlyphIterator.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/GlyphIterator.h 2014-07-15 23:24:37.000000000 -0700 @@ -49,7 +49,7 @@ class GlyphIterator : public UMemory { public: @@ -79502,7 +82469,7 @@ U_NAMESPACE_END --- ./jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -95,6 +95,8 @@ le_uint32 delta = 0; @@ -79552,7 +82519,7 @@ } --- ./jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -123,7 +123,7 @@ { const LEReferenceTo<ContextualSubstitutionSubtable> subtable(lookupSubtable, success); @@ -79572,7 +82539,7 @@ } --- ./jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/IndicLayoutEngine.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -44,7 +44,7 @@ #include "LEGlyphStorage.h" @@ -79626,7 +82593,7 @@ } --- ./jdk/src/share/native/sun/font/layout/KernTable.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/KernTable.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/KernTable.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -39,7 +39,7 @@ #include <stdio.h> @@ -79695,7 +82662,7 @@ storage[i-1], storage[i], i, value & 0xffff, font->xUnitsToPoints(value)); fflush(stdout); --- ./jdk/src/share/native/sun/font/layout/LEFontInstance.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LEFontInstance.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LEFontInstance.h 2014-07-15 23:24:37.000000000 -0700 @@ -181,6 +181,10 @@ * * Subclasses which represent composite fonts should always return <code>NULL</code>. @@ -79723,7 +82690,7 @@ - - --- ./jdk/src/share/native/sun/font/layout/LEGlyphFilter.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LEGlyphFilter.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LEGlyphFilter.h 2014-07-15 23:24:37.000000000 -0700 @@ -62,7 +62,7 @@ * * @internal @@ -79734,7 +82701,7 @@ #endif /* U_HIDE_INTERNAL_API */ --- ./jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LEGlyphStorage.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -458,7 +458,7 @@ success = LE_INDEX_OUT_OF_BOUNDS_ERROR; return; @@ -79750,14 +82717,14 @@ U_NAMESPACE_END - --- ./jdk/src/share/native/sun/font/layout/LEGlyphStorage.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LEGlyphStorage.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LEGlyphStorage.h 2014-07-15 23:24:37.000000000 -0700 @@ -568,4 +568,3 @@ U_NAMESPACE_END #endif - --- ./jdk/src/share/native/sun/font/layout/LEScripts.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LEScripts.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LEScripts.h 2014-07-15 23:24:37.000000000 -0700 @@ -30,7 +30,7 @@ * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS * YOU REALLY KNOW WHAT YOU'RE DOING. @@ -79786,7 +82753,7 @@ U_NAMESPACE_END --- ./jdk/src/share/native/sun/font/layout/LEStandalone.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LEStandalone.h 2014-07-15 23:24:37.000000000 -0700 @@ -132,6 +132,9 @@ #define uprv_memcpy memcpy #define uprv_realloc realloc @@ -79798,7 +82765,7 @@ #ifdef _LITTLE_ENDIAN #define U_IS_BIG_ENDIAN 0 --- ./jdk/src/share/native/sun/font/layout/LETableReference.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LETableReference.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LETableReference.h 2014-07-15 23:24:37.000000000 -0700 @@ -38,34 +38,47 @@ #include "LETypes.h" #include "LEFontInstance.h" @@ -80240,7 +83207,7 @@ U_NAMESPACE_END --- ./jdk/src/share/native/sun/font/layout/LETypes.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LETypes.h 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LETypes.h 2014-07-15 23:24:37.000000000 -0700 @@ -337,6 +337,20 @@ typedef struct LEPoint LEPoint; #endif @@ -80301,7 +83268,7 @@ -#endif /* __LETYPES_H */ +#endif --- ./jdk/src/share/native/sun/font/layout/LayoutEngine.cpp 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LayoutEngine.cpp 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LayoutEngine.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -156,7 +156,7 @@ CanonMarkFilter(const LEReferenceTo<GlyphDefinitionTableHeader> &gdefTable, LEErrorCode &success); virtual ~CanonMarkFilter(); @@ -80415,7 +83382,7 @@ break; --- ./jdk/src/share/native/sun/font/layout/LayoutEngine.h 2013-09-06 11:29:01.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LayoutEngine.h 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LayoutEngine.h 2014-07-15 23:24:37.000000000 -0700 @@ -156,8 +156,8 @@ * @param fontInstance - the font for the text * @param scriptCode - the script for the text @@ -80428,7 +83395,7 @@ * * @see LEFontInstance --- ./jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/layout/LigatureSubstProc2.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -95,7 +95,7 @@ if (actionOffset != 0) { @@ -80457,7 +83424,7 @@ while (mm >= 0) { if (++m >= nComponents) { --- ./jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -49,14 +49,20 @@ return 0; } @@ -80493,7 +83460,7 @@ TTGlyphID deletedGlyph = tempIterator.ignoresMarks()? 0xFFFE : 0xFFFF; --- ./jdk/src/share/native/sun/font/layout/LookupProcessor.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/LookupProcessor.cpp 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/layout/LookupProcessor.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -60,8 +60,10 @@ LEReferenceTo<LookupSubtable> lookupSubtable = lookupTable->getLookupSubtable(lookupTable, subtable, success); @@ -80582,7 +83549,7 @@ // don't add the required feature to the list more than once... --- ./jdk/src/share/native/sun/font/layout/Lookups.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/Lookups.cpp 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/Lookups.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -65,7 +65,7 @@ if(LE_FAILURE(success)) return 0; @@ -80593,7 +83560,7 @@ U_NAMESPACE_END --- ./jdk/src/share/native/sun/font/layout/MarkArrays.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/MarkArrays.cpp 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/MarkArrays.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -38,20 +38,28 @@ U_NAMESPACE_BEGIN @@ -80630,7 +83597,7 @@ } --- ./jdk/src/share/native/sun/font/layout/MarkArrays.h 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/MarkArrays.h 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/MarkArrays.h 2014-07-15 23:24:37.000000000 -0700 @@ -54,8 +54,9 @@ le_uint16 markCount; MarkRecord markRecordArray[ANY_NUMBER]; @@ -80644,7 +83611,7 @@ LE_VAR_ARRAY(MarkArray, markRecordArray) --- ./jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -66,11 +66,12 @@ } @@ -80719,7 +83686,7 @@ glyphIterator->setCurrGlyphPositionAdjustment(anchorDiffX - baseAdvance.fX, anchorDiffY - baseAdvance.fY, -markAdvance.fX, -markAdvance.fY); --- ./jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -65,8 +65,11 @@ } @@ -80771,7 +83738,7 @@ fontInstance->getGlyphAdvance(markGlyph, pixels); fontInstance->pixelsToUnits(pixels, markAdvance); --- ./jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -66,8 +66,11 @@ } @@ -80829,7 +83796,7 @@ if (glyphIterator->isRightToLeft()) { --- ./jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/MultipleSubstSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -54,9 +54,10 @@ // FIXME: is this always the right thing to do? // FIXME: should this only be done for a non-zero @@ -80870,7 +83837,7 @@ } } --- ./jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp 2014-01-18 12:16:23.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -470,6 +470,7 @@ void OpenTypeLayoutEngine::adjustGlyphPositions(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse, LEGlyphStorage &glyphStorage, LEErrorCode &success) @@ -80906,7 +83873,7 @@ xAdjust += fFontInstance->xUnitsToPoints(xAdvance); --- ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -80,6 +80,7 @@ Offset OpenTypeUtilities::getTagOffset(LETag tag, const LEReferenceToArrayOf<TagAndOffsetRecord> &records, LEErrorCode &success) { @@ -80949,7 +83916,7 @@ } --- ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.h 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.h 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/OpenTypeUtilities.h 2014-07-15 23:24:37.000000000 -0700 @@ -46,15 +46,14 @@ public: static le_int8 highBit(le_int32 value); @@ -80969,7 +83936,7 @@ static le_int32 search(le_uint16 value, const le_uint16 array[], le_int32 count); static le_int32 search(le_uint32 value, const le_uint32 array[], le_int32 count); --- ./jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/PairPositioningSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -76,19 +76,17 @@ { LEGlyphID firstGlyph = glyphIterator->getCurrGlyphID(); @@ -81108,7 +84075,7 @@ U_NAMESPACE_END --- ./jdk/src/share/native/sun/font/layout/PairPositioningSubtables.h 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/PairPositioningSubtables.h 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/PairPositioningSubtables.h 2014-07-15 23:24:37.000000000 -0700 @@ -77,9 +77,8 @@ le_uint32 process(const LEReferenceTo<PairPositioningFormat1Subtable> &base, GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode &success) const; @@ -81121,7 +84088,7 @@ LE_VAR_ARRAY(PairPositioningFormat1Subtable, pairSetTableOffsetArray) --- ./jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ScriptAndLanguage.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -106,7 +106,8 @@ } } else { @@ -81133,7 +84100,7 @@ if (scriptTableOffset != 0) { --- ./jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -126,13 +126,13 @@ linaScriptTag, /* 'lina' (LINA) */ mandScriptTag, /* 'mand' (MANDAIC) */ @@ -81169,7 +84136,7 @@ nbatScriptTag, /* 'nbat' (NBAT) */ palmScriptTag, /* 'palm' (PALM) */ --- ./jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.h 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.h 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ScriptAndLanguageTags.h 2014-07-15 23:24:37.000000000 -0700 @@ -140,13 +140,13 @@ const LETag linaScriptTag = 0x6C696E61; /* 'lina' (LINA) */ const LETag mandScriptTag = 0x6D616E64; /* 'mand' (MANDAIC) */ @@ -81205,7 +84172,7 @@ const LETag nbatScriptTag = 0x6E626174; /* 'nbat' (NBAT) */ const LETag palmScriptTag = 0x70616C6D; /* 'palm' (PALM) */ --- ./jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/layout/SegmentArrayProcessor.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -73,6 +73,7 @@ if (offset != 0) { @@ -81215,7 +84182,7 @@ glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph); } --- ./jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -65,16 +65,17 @@ for (glyph = 0; glyph < glyphCount; glyph += 1) { @@ -81241,7 +84208,7 @@ } } --- ./jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/SinglePositioningSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -75,7 +75,7 @@ } @@ -81261,7 +84228,7 @@ return 1; } --- ./jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -76,7 +76,7 @@ if (coverageIndex >= 0) { TTGlyphID substitute = ((TTGlyphID) LE_GET_GLYPH(glyph)) + SWAPW(deltaGlyphID); @@ -81281,7 +84248,7 @@ } --- ./jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/font/layout/StateTableProcessor.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -97,6 +97,7 @@ LEReferenceToArrayOf<EntryTableIndex> stateArray(stHeader, success, currentState, LE_UNBOUNDED_ARRAY); @@ -81291,7 +84258,7 @@ currentState = processStateEntry(glyphStorage, currGlyph, entryTableIndex); LE_STATE_PATIENCE_INCR(currGlyph); --- ./jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/SunLayoutEngine.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -104,6 +104,10 @@ int putGV(JNIEnv* env, jint gmask, jint baseIndex, jobject gvdata, const LayoutEngine* engine, int glyphCount) { @@ -81304,7 +84271,7 @@ jarray glyphArray = (jarray)env->GetObjectField(gvdata, gvdGlyphsFID); if (IS_NULL(glyphArray)) { --- ./jdk/src/share/native/sun/font/layout/TibetanReordering.h 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/TibetanReordering.h 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/TibetanReordering.h 2014-07-15 23:24:37.000000000 -0700 @@ -39,7 +39,7 @@ */ @@ -81315,7 +84282,7 @@ /** * \file --- ./jdk/src/share/native/sun/font/layout/ValueRecords.cpp 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ValueRecords.cpp 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ValueRecords.cpp 2014-07-15 23:24:37.000000000 -0700 @@ -59,8 +59,8 @@ return SWAPW(value); } @@ -81427,7 +84394,7 @@ yAdvanceAdjustment += fontInstance->yPixelsToUnits(yAdj); } --- ./jdk/src/share/native/sun/font/layout/ValueRecords.h 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/font/layout/ValueRecords.h 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/font/layout/ValueRecords.h 2014-07-15 23:24:37.000000000 -0700 @@ -53,10 +53,10 @@ le_int16 getFieldValue(ValueFormat valueFormat, ValueRecordField field) const; @@ -81444,7 +84411,7 @@ static le_int16 getSize(ValueFormat valueFormat); --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c 2014-07-15 23:24:37.000000000 -0700 @@ -81,7 +81,7 @@ cmsUInt32Number surround; cmsFloat64Number n, Nbb, Ncb, z, FL, D; @@ -81471,7 +84438,7 @@ _cmsAssert(pIn != NULL); _cmsAssert(pOut != NULL); --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscgats.c 2014-07-15 23:24:37.000000000 -0700 @@ -59,8 +59,8 @@ // IT8.7 / CGATS.17-200x handling ----------------------------------------------------------------------------- @@ -81688,7 +84655,7 @@ it8 ->DoubleFormatter[sizeof(it8 ->DoubleFormatter)-1] = 0; } --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmscnvrt.c 2014-07-15 23:24:37.000000000 -0700 @@ -270,7 +270,7 @@ // m2 holds CHAD from output white to D50 times abs. col. scaling @@ -81867,7 +84834,7 @@ } --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmserr.c 2014-07-15 23:24:37.000000000 -0700 @@ -302,8 +302,6 @@ return NULL; } @@ -81878,7 +84845,7 @@ chunk ->Used = 0; chunk ->next = NULL; --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsgamma.c 2014-07-15 23:24:37.000000000 -0700 @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // @@ -82034,7 +85001,7 @@ // Seems ok for (i=0; i < nItems; i++) { --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsgmt.c 2014-07-15 23:24:37.000000000 -0700 @@ -249,13 +249,10 @@ cmsFloat64Number dE1, dE2, ErrorRatio; @@ -82139,7 +85106,7 @@ } else --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsintrp.c 2014-07-15 23:24:37.000000000 -0700 @@ -83,7 +83,6 @@ @@ -82311,7 +85278,7 @@ rest = pk - (cmsFloat32Number) k0; --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsio0.c 2014-07-15 23:24:37.000000000 -0700 @@ -154,7 +154,6 @@ return iohandler; @@ -82751,7 +85718,7 @@ if (!_cmsNewTag(Icc, sig, &i)) return FALSE; --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsio1.c 2014-07-15 23:24:37.000000000 -0700 @@ -129,7 +129,6 @@ Tag = (cmsMAT3*) cmsReadTag(hProfile, cmsSigChromaticAdaptationTag); @@ -83221,7 +86188,7 @@ // --------------------------------------------------------------------------------------------------------------- --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmslut.c 2014-07-15 23:24:37.000000000 -0700 @@ -264,10 +264,10 @@ if (NewElem ->TheCurves != NULL) { for (i=0; i < NewElem ->nCurves; i++) { @@ -83455,7 +86422,7 @@ if (Hint == NULL) { --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsmd5.c 2014-07-15 23:24:37.000000000 -0700 @@ -338,7 +338,7 @@ Error: @@ -83466,7 +86433,7 @@ memmove(Icc, &Keep, sizeof(_cmsICCPROFILE)); return FALSE; --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsnamed.c 2014-07-15 23:24:37.000000000 -0700 @@ -359,9 +359,9 @@ if (Best == -1) Best = 0; @@ -83571,7 +86538,7 @@ entry = old_dict ->head; while (entry != NULL) { --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsopt.c 2014-07-15 23:24:37.000000000 -0700 @@ -27,6 +27,7 @@ // However, the following notice accompanied the original version of this // file: @@ -83899,7 +86866,7 @@ // Copy the parameters --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmspack.c 2014-07-15 23:24:37.000000000 -0700 @@ -317,6 +317,23 @@ } @@ -83953,7 +86920,7 @@ fl ->Factory = Plugin ->FormattersFactory; --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmspcs.c 2014-07-15 23:24:37.000000000 -0700 @@ -898,9 +898,11 @@ { switch (ColorSpace) { @@ -83980,7 +86947,7 @@ case cmsSigMCH5Data: --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsplugin.c 2014-07-15 23:24:37.000000000 -0700 @@ -125,10 +125,14 @@ pOut[0] = pIn[7]; @@ -84090,7 +87057,7 @@ if (PluginPool != NULL) _cmsSubAllocDestroy(PluginPool); --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsps2.c 2014-07-15 23:24:37.000000000 -0700 @@ -806,7 +806,6 @@ mpe = Pipeline ->Elements; @@ -84125,7 +87092,7 @@ break; --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmssamp.c 2014-07-15 23:24:37.000000000 -0700 @@ -56,6 +56,8 @@ #include "lcms2_internal.h" @@ -84499,7 +87466,7 @@ } --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmstypes.c 2014-07-15 23:24:37.000000000 -0700 @@ -91,7 +91,7 @@ // Register a new type handler. This routine is shared between normal types and MPE @@ -85168,7 +88135,7 @@ pt ->Signature = Plugin ->Signature; --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsvirt.c 2014-07-15 23:24:37.000000000 -0700 @@ -208,9 +208,26 @@ if (TransferFunction) { @@ -85514,7 +88481,7 @@ return hProfile; --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmswtpnt.c 2014-07-15 23:24:37.000000000 -0700 @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // @@ -85616,7 +88583,7 @@ if (ConeMatrix == NULL) ConeMatrix = &LamRigg; --- ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/cmsxform.c 2014-07-15 23:24:37.000000000 -0700 @@ -396,7 +396,7 @@ static _cmsTransformCollection* TransformCollection = NULL; @@ -85689,7 +88656,7 @@ // Create a gamut check LUT if requested if (hGamutProfile != NULL && (dwFlags & cmsFLAGS_GAMUTCHECK)) --- ./jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/lcms2.h 2014-07-15 23:24:37.000000000 -0700 @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // @@ -85765,7 +88732,7 @@ CMSAPI void CMSEXPORT cmsSetHeaderModel(cmsHPROFILE hProfile, cmsUInt32Number model); CMSAPI void CMSEXPORT cmsSetHeaderAttributes(cmsHPROFILE hProfile, cmsUInt64Number Flags); --- ./jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h 2013-09-06 11:29:02.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/cmm/lcms/lcms2_internal.h 2014-07-15 23:24:37.000000000 -0700 @@ -27,7 +27,7 @@ // However, the following notice accompanied the original version of this // file: @@ -85854,7 +88821,7 @@ cmsSEQ* Sequence; --- ./jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c 2013-09-06 11:29:03.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/src/share/native/sun/java2d/opengl/OGLBlitLoops.c 2014-07-15 23:24:37.000000000 -0700 @@ -661,7 +661,12 @@ (sy2-sy1) != (jint)(dy2-dy1) || oglc->extraAlpha != 1.0f; @@ -85870,7 +88837,7 @@ // just use the glDrawPixels() codepath viaTexture = JNI_FALSE; --- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2013-09-06 11:29:03.000000000 -0700 -+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2014-07-15 23:24:37.000000000 -0700 @@ -26,7 +26,7 @@ #ifndef OGLFuncs_h_Included #define OGLFuncs_h_Included @@ -85881,7 +88848,7 @@ #endif #include "jni.h" --- ./jdk/src/share/native/sun/management/Flag.c 2013-09-06 11:29:03.000000000 -0700 -+++ ./jdk/src/share/native/sun/management/Flag.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/share/native/sun/management/Flag.c 2014-07-15 23:24:37.000000000 -0700 @@ -95,12 +95,12 @@ return 0; } @@ -85898,7 +88865,7 @@ if (globals == NULL) { JNU_ThrowOutOfMemoryError(env, 0); --- ./jdk/src/share/native/sun/management/GcInfoBuilder.c 2013-09-06 11:29:03.000000000 -0700 -+++ ./jdk/src/share/native/sun/management/GcInfoBuilder.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/share/native/sun/management/GcInfoBuilder.c 2014-07-15 23:24:37.000000000 -0700 @@ -59,12 +59,12 @@ return; } @@ -85951,7 +88918,7 @@ if (gc_stat.gc_ext_attribute_values != NULL) { free(gc_stat.gc_ext_attribute_values); --- ./jdk/src/share/native/sun/management/HotSpotDiagnostic.c 2013-09-06 11:29:03.000000000 -0700 -+++ ./jdk/src/share/native/sun/management/HotSpotDiagnostic.c 2013-12-01 11:14:31.000000000 -0800 ++++ ./jdk/src/share/native/sun/management/HotSpotDiagnostic.c 2014-07-15 23:24:37.000000000 -0700 @@ -29,7 +29,7 @@ #include "sun_management_HotSpotDiagnostic.h" @@ -85961,8 +88928,200 @@ (JNIEnv *env, jobject dummy, jstring outputfile, jboolean live) { jmm_interface->DumpHeap0(env, outputfile, live); +--- ./jdk/src/share/native/sun/security/ec/ECC_JNI.cpp 2013-09-06 11:29:04.000000000 -0700 ++++ ./jdk/src/share/native/sun/security/ec/ECC_JNI.cpp 2014-07-15 23:24:37.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2009, 2014, 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 +@@ -62,24 +62,42 @@ + SECITEM_FreeItem(&ecparams->curveOID, B_FALSE); + if (freeStruct) + free(ecparams); ++ ++} ++ ++jbyteArray getEncodedBytes(JNIEnv *env, SECItem *hSECItem) ++{ ++ SECItem *s = (SECItem *)hSECItem; ++ ++ jbyteArray jEncodedBytes = env->NewByteArray(s->len); ++ if (jEncodedBytes == NULL) { ++ return NULL; ++ } ++ // Copy bytes from a native SECItem buffer to java byte array ++ env->SetByteArrayRegion(jEncodedBytes, 0, s->len, (jbyte *)s->data); ++ if (env->ExceptionCheck()) { //should never happen ++ return NULL; ++ } ++ return jEncodedBytes; + } + + /* + * Class: sun_security_ec_ECKeyPairGenerator + * Method: generateECKeyPair +- * Signature: (I[B[B)[J ++ * Signature: (I[B[B)[B + */ +-JNIEXPORT jlongArray ++JNIEXPORT jobjectArray + JNICALL Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair + (JNIEnv *env, jclass clazz, jint keySize, jbyteArray encodedParams, jbyteArray seed) + { +- ECPrivateKey *privKey; /* contains both public and private values */ ++ ECPrivateKey *privKey = NULL; /* contains both public and private values */ + ECParams *ecparams = NULL; + SECKEYECParams params_item; + jint jSeedLength; + jbyte* pSeedBuffer = NULL; +- jlongArray result = NULL; +- jlong* resultElements = NULL; ++ jobjectArray result = NULL; ++ jclass baCls = NULL; ++ jbyteArray jba; + + // Initialize the ECParams struct + params_item.len = env->GetArrayLength(encodedParams); +@@ -106,61 +124,64 @@ + } + + jboolean isCopy; +- result = env->NewLongArray(2); +- resultElements = env->GetLongArrayElements(result, &isCopy); +- +- resultElements[0] = (jlong) &(privKey->privateValue); // private big integer +- resultElements[1] = (jlong) &(privKey->publicValue); // encoded ec point ++ baCls = env->FindClass("[B"); ++ if (baCls == NULL) { ++ goto cleanup; ++ } ++ result = env->NewObjectArray(2, baCls, NULL); ++ if (result == NULL) { ++ goto cleanup; ++ } ++ jba = getEncodedBytes(env, &(privKey->privateValue)); ++ if (jba == NULL) { ++ result = NULL; ++ goto cleanup; ++ } ++ env->SetObjectArrayElement(result, 0, jba); // big integer ++ if (env->ExceptionCheck()) { // should never happen ++ result = NULL; ++ goto cleanup; ++ } + +- // If the array is a copy then we must write back our changes +- if (isCopy == JNI_TRUE) { +- env->ReleaseLongArrayElements(result, resultElements, 0); ++ jba = getEncodedBytes(env, &(privKey->publicValue)); ++ if (jba == NULL) { ++ result = NULL; ++ goto cleanup; ++ } ++ env->SetObjectArrayElement(result, 1, jba); // encoded ec point ++ if (env->ExceptionCheck()) { // should never happen ++ result = NULL; ++ goto cleanup; + } + + cleanup: + { +- if (params_item.data) ++ if (params_item.data) { + env->ReleaseByteArrayElements(encodedParams, + (jbyte *) params_item.data, JNI_ABORT); ++ } + +- if (ecparams) ++ if (ecparams) { + FreeECParams(ecparams, true); ++ } + + if (privKey) { + FreeECParams(&privKey->ecParams, false); + SECITEM_FreeItem(&privKey->version, B_FALSE); +- // Don't free privKey->privateValue and privKey->publicValue ++ SECITEM_FreeItem(&privKey->privateValue, B_FALSE); ++ SECITEM_FreeItem(&privKey->publicValue, B_FALSE); ++ free(privKey); + } + +- if (pSeedBuffer) ++ if (pSeedBuffer) { + delete [] pSeedBuffer; ++ } + } + + return result; + } + + /* +- * Class: sun_security_ec_ECKeyPairGenerator +- * Method: getEncodedBytes +- * Signature: (J)[B +- */ +-JNIEXPORT jbyteArray +-JNICALL Java_sun_security_ec_ECKeyPairGenerator_getEncodedBytes +- (JNIEnv *env, jclass clazz, jlong hSECItem) +-{ +- SECItem *s = (SECItem *)hSECItem; +- jbyteArray jEncodedBytes = env->NewByteArray(s->len); +- +- // Copy bytes from a native SECItem buffer to Java byte array +- env->SetByteArrayRegion(jEncodedBytes, 0, s->len, (jbyte *)s->data); +- +- // Use B_FALSE to free only the SECItem->data +- SECITEM_FreeItem(s, B_FALSE); +- +- return jEncodedBytes; +-} +- +-/* + * Class: sun_security_ec_ECDSASignature + * Method: signDigest + * Signature: ([B[B[B[B)[B +@@ -234,21 +255,31 @@ + + cleanup: + { +- if (params_item.data) ++ if (params_item.data) { + env->ReleaseByteArrayElements(encodedParams, + (jbyte *) params_item.data, JNI_ABORT); ++ } + +- if (pDigestBuffer) ++ if (privKey.privateValue.data) { ++ env->ReleaseByteArrayElements(privateKey, ++ (jbyte *) privKey.privateValue.data, JNI_ABORT); ++ } ++ ++ if (pDigestBuffer) { + delete [] pDigestBuffer; ++ } + +- if (pSignedDigestBuffer) ++ if (pSignedDigestBuffer) { + delete [] pSignedDigestBuffer; ++ } + +- if (pSeedBuffer) ++ if (pSeedBuffer) { + delete [] pSeedBuffer; ++ } + +- if (ecparams) ++ if (ecparams) { + FreeECParams(ecparams, true); ++ } + } + + return jSignedDigest; --- ./jdk/src/share/native/sun/security/krb5/nativeccache.c 2013-09-06 11:29:04.000000000 -0700 -+++ ./jdk/src/share/native/sun/security/krb5/nativeccache.c 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/src/share/native/sun/security/krb5/nativeccache.c 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -86053,7 +89212,7 @@ return krbCreds; } --- ./jdk/src/solaris/back/linker_md.c 2013-09-06 11:29:05.000000000 -0700 -+++ ./jdk/src/solaris/back/linker_md.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/back/linker_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -55,29 +55,27 @@ #endif @@ -86108,7 +89267,7 @@ const int pnamelen = pname ? strlen(pname) : 0; --- ./jdk/src/solaris/back/util_md.h 2013-09-06 11:29:05.000000000 -0700 -+++ ./jdk/src/solaris/back/util_md.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/back/util_md.h 2014-07-15 23:24:38.000000000 -0700 @@ -51,7 +51,7 @@ /* On little endian machines, convert java big endian numbers. */ @@ -86119,7 +89278,7 @@ #define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) #define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff))) --- ./jdk/src/solaris/bin/ergo.c 2013-09-06 11:29:05.000000000 -0700 -+++ ./jdk/src/solaris/bin/ergo.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/bin/ergo.c 2014-07-15 23:24:37.000000000 -0700 @@ -100,6 +100,27 @@ /* Compute physical memory by asking the OS */ uint64_t @@ -86155,7 +89314,7 @@ +#endif } --- ./jdk/src/solaris/bin/ergo.h 2013-09-06 11:29:05.000000000 -0700 -+++ ./jdk/src/solaris/bin/ergo.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/bin/ergo.h 2014-07-15 23:24:37.000000000 -0700 @@ -33,6 +33,10 @@ #include <sys/stat.h> #include <unistd.h> @@ -86168,7 +89327,7 @@ #include "java.h" --- ./jdk/src/solaris/bin/ergo_i586.c 2013-09-06 11:29:05.000000000 -0700 -+++ ./jdk/src/solaris/bin/ergo_i586.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/bin/ergo_i586.c 2014-07-15 23:24:37.000000000 -0700 @@ -106,7 +106,7 @@ #endif /* __solaris__ */ @@ -86228,7 +89387,7 @@ +#endif } --- ./jdk/src/solaris/bin/java_md_solinux.c 2013-09-06 11:29:05.000000000 -0700 -+++ ./jdk/src/solaris/bin/java_md_solinux.c 2014-06-06 21:15:42.000000000 -0700 ++++ ./jdk/src/solaris/bin/java_md_solinux.c 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. @@ -86323,7 +89482,7 @@ if (hSplashLib) { void* sym = dlsym(hSplashLib, name); --- ./jdk/src/solaris/bin/java_md_solinux.h 2013-09-06 11:29:05.000000000 -0700 -+++ ./jdk/src/solaris/bin/java_md_solinux.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/bin/java_md_solinux.h 2014-07-15 23:24:37.000000000 -0700 @@ -33,6 +33,10 @@ #include <sys/time.h> #define CounterGet() (gethrtime()/1000) @@ -86346,7 +89505,7 @@ static const char *system_dir = "/usr/jdk"; static const char *user_dir = "/jdk"; --- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.bsd 2014-07-15 23:24:37.000000000 -0700 @@ -63,11 +63,66 @@ private /* final */ InputStream stdout; private /* final */ InputStream stderr; @@ -86521,7 +89680,7 @@ } } --- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux 2014-07-15 23:24:37.000000000 -0700 @@ -63,11 +63,61 @@ private /* final */ InputStream stdout; private /* final */ InputStream stderr; @@ -86691,7 +89850,7 @@ } } --- ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris 2014-07-15 23:24:37.000000000 -0700 @@ -26,6 +26,8 @@ package java.lang; @@ -86803,7 +89962,7 @@ } } --- ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDConstants.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. @@ -86920,7 +90079,7 @@ } } finally { --- ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/MotifDnDDropTargetProtocol.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -87025,7 +90184,7 @@ XToolkit.awtUnlock(); } --- ./jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/WindowPropertyGetter.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. @@ -87052,7 +90211,7 @@ return status; } finally { --- ./jdk/src/solaris/classes/sun/awt/X11/XClipboard.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XClipboard.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XClipboard.java 2014-07-15 23:24:37.000000000 -0700 @@ -84,7 +84,7 @@ protected synchronized void setContentsNative(Transferable contents) { @@ -87072,7 +90231,7 @@ } --- ./jdk/src/solaris/classes/sun/awt/X11/XConstants.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XConstants.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XConstants.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. @@ -87081,7 +90240,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XDnDDragSourceProtocol.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. @@ -87128,7 +90287,7 @@ throw new XException("Cannot write XdndActionList property"); } --- ./jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XDnDDropTargetProtocol.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. @@ -87335,7 +90494,7 @@ logger.warning("Cannot set XdndTypeList on the proxy window"); } --- ./jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XDragSourceProtocol.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. @@ -87398,7 +90557,7 @@ public abstract boolean processProxyModeEvent(XClientMessageEvent xclient, --- ./jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XDropTargetRegistry.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. @@ -87483,7 +90642,7 @@ } } --- ./jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XEmbedCanvasPeer.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. @@ -87513,7 +90672,7 @@ } --- ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandler.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. @@ -87531,7 +90690,7 @@ } --- ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XErrorHandlerUtil.java 2014-07-15 23:24:37.000000000 -0700 @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -87702,7 +90861,7 @@ + } +} --- ./jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XKeyboardFocusManagerPeer.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. @@ -87740,7 +90899,7 @@ } --- ./jdk/src/solaris/classes/sun/awt/X11/XQueryTree.java 2013-09-06 11:29:06.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XQueryTree.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XQueryTree.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. @@ -87767,7 +90926,7 @@ return status; } finally { --- ./jdk/src/solaris/classes/sun/awt/X11/XToolkit.java 2013-09-06 11:29:07.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XToolkit.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XToolkit.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. @@ -87921,7 +91080,7 @@ } } --- ./jdk/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java 2013-09-06 11:29:07.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XTranslateCoordinates.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. @@ -87948,7 +91107,7 @@ return status; } finally { --- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2013-09-06 11:29:07.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2014-07-15 23:24:37.000000000 -0700 @@ -283,12 +283,12 @@ winmgr_running = false; substruct.set_event_mask(XConstants.SubstructureRedirectMask); @@ -87985,7 +91144,7 @@ return false; } --- ./jdk/src/solaris/classes/sun/awt/X11/XlibUtil.java 2013-09-06 11:29:07.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/XlibUtil.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/XlibUtil.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. @@ -88023,7 +91182,7 @@ return wattr.get_map_state(); } --- ./jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2013-09-06 11:29:07.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11/generator/WrapperGenerator.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2009, Oracle and/or its affiliates. All rights reserved. @@ -88050,7 +91209,7 @@ if (!ft.isVoid()) { pw.println("\t\t\treturn status;"); --- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2013-09-06 11:29:07.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2014-07-15 23:24:37.000000000 -0700 @@ -213,7 +213,7 @@ if (fontID != null) { fileName = (String)fontNameMap.get(fontID); @@ -88079,7 +91238,7 @@ !mFontConfig.fontFilesArePresent()) || (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) { --- ./jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2013-09-06 11:29:07.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/awt/X11GraphicsDevice.java 2014-07-15 23:24:37.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -88130,8 +91289,66 @@ t.setContextClassLoader(null); Runtime.getRuntime().addShutdownHook(t); return null; +--- ./jdk/src/solaris/classes/sun/font/FcFontConfiguration.java 2013-09-06 11:29:07.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/font/FcFontConfiguration.java 2014-07-15 23:24:37.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2008, 2014, 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 +@@ -33,6 +33,7 @@ + import java.net.InetAddress; + import java.net.UnknownHostException; + import java.nio.charset.Charset; ++import java.nio.charset.StandardCharsets; + import java.nio.file.Files; + import java.util.HashMap; + import java.util.HashSet; +@@ -173,8 +174,16 @@ + } + + @Override +- public FontDescriptor[] getFontDescriptors(String fontName, int style) { +- return new FontDescriptor[0]; ++ protected FontDescriptor[] buildFontDescriptors(int fontIndex, int styleIndex) { ++ CompositeFontDescriptor[] cfi = get2DCompositeFontInfo(); ++ int idx = fontIndex * NUM_STYLES + styleIndex; ++ String[] componentFaceNames = cfi[idx].getComponentFaceNames(); ++ FontDescriptor[] ret = new FontDescriptor[componentFaceNames.length]; ++ for (int i = 0; i < componentFaceNames.length; i++) { ++ ret[i] = new FontDescriptor(componentFaceNames[i], StandardCharsets.UTF_8.newEncoder(), new int[0]); ++ } ++ ++ return ret; + } + + @Override +@@ -250,10 +259,12 @@ + } + + String[] fileNames = new String[numFonts]; ++ String[] faceNames = new String[numFonts]; + + int index; + for (index = 0; index < fcFonts.length; index++) { + fileNames[index] = fcFonts[index].fontFile; ++ faceNames[index] = fcFonts[index].familyName; + } + + if (installedFallbackFontFiles != null) { +@@ -266,7 +277,7 @@ + = new CompositeFontDescriptor( + faceName, + 1, +- null, ++ faceNames, + fileNames, + null, null); + } --- ./jdk/src/solaris/classes/sun/net/PortConfig.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/solaris/classes/sun/net/PortConfig.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/net/PortConfig.java 2014-07-15 23:24:37.000000000 -0700 @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -88223,7 +91440,7 @@ + } +} --- ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java 2013-09-06 11:29:08.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java 2014-07-15 23:24:37.000000000 -0700 @@ -50,7 +50,7 @@ return new SolarisAsynchronousChannelProvider(); if (osname.equals("Linux")) @@ -88234,7 +91451,7 @@ throw new InternalError("platform not recognized"); } --- ./jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2013-09-06 11:29:08.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2013-12-01 11:14:32.000000000 -0800 ++++ ./jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2014-07-15 23:24:37.000000000 -0700 @@ -26,9 +26,11 @@ package sun.nio.ch; @@ -88262,7 +91479,7 @@ // The pollfd array for results from devpoll driver private final AllocatedNativeObject pollArray; --- ./jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2013-09-06 11:29:08.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2013-12-01 11:14:32.000000000 -0800 ++++ ./jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2014-07-15 23:24:37.000000000 -0700 @@ -26,9 +26,11 @@ package sun.nio.ch; @@ -88313,7 +91530,7 @@ } } --- ./jdk/src/solaris/classes/sun/nio/ch/EventPortWrapper.java 2013-09-06 11:29:08.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/ch/EventPortWrapper.java 2013-12-01 11:14:32.000000000 -0800 ++++ ./jdk/src/solaris/classes/sun/nio/ch/EventPortWrapper.java 2014-07-15 23:24:37.000000000 -0700 @@ -25,9 +25,14 @@ package sun.nio.ch; @@ -88342,7 +91559,7 @@ // special update status to indicate that it should be ignored private static final byte IGNORE = -1; --- ./jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java 2013-09-06 11:29:08.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java 2014-01-18 12:16:27.000000000 -0800 ++++ ./jdk/src/solaris/classes/sun/nio/ch/SctpChannelImpl.java 2014-07-15 23:24:37.000000000 -0700 @@ -180,6 +180,10 @@ SctpNet.throwAlreadyBoundException(); InetSocketAddress isa = (local == null) ? @@ -88355,7 +91572,7 @@ InetSocketAddress boundIsa = Net.localAddress(fd); port = boundIsa.getPort(); --- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2013-09-06 11:29:08.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2014-07-15 23:24:37.000000000 -0700 @@ -70,6 +70,8 @@ return createProvider("sun.nio.fs.LinuxFileSystemProvider"); if (osname.equals("Darwin") || osname.contains("OS X")) @@ -88366,7 +91583,7 @@ } } --- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2013-09-06 11:29:08.000000000 -0700 -+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2014-07-15 23:24:37.000000000 -0700 @@ -129,6 +129,7 @@ static boolean isBSD() { @@ -88376,7 +91593,7 @@ } --- ./jdk/src/solaris/demo/jni/Poller/Poller.c 2013-09-06 11:29:09.000000000 -0700 -+++ ./jdk/src/solaris/demo/jni/Poller/Poller.c 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/solaris/demo/jni/Poller/Poller.c 2014-07-15 23:24:37.000000000 -0700 @@ -318,7 +318,7 @@ ioevent_t *ioeh; @@ -88432,7 +91649,7 @@ ioeh = &IOE_handles[handle]; --- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2013-09-06 11:29:09.000000000 -0700 -+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2014-07-15 23:24:37.000000000 -0700 @@ -376,33 +376,32 @@ } @@ -88487,7 +91704,7 @@ int pnamelen; --- ./jdk/src/solaris/javavm/export/jvm_md.h 2013-09-06 11:29:09.000000000 -0700 -+++ ./jdk/src/solaris/javavm/export/jvm_md.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/javavm/export/jvm_md.h 2014-07-15 23:24:37.000000000 -0700 @@ -75,7 +75,11 @@ #define JVM_O_O_APPEND O_APPEND #define JVM_O_EXCL O_EXCL @@ -88501,7 +91718,7 @@ /* Signals */ --- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2013-09-06 11:29:09.000000000 -0700 -+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -168,6 +168,9 @@ /* * XXXBSD: there's no way available to get swap info in @@ -88552,7 +91769,7 @@ // throw_internal_error(env, "Unimplemented in FreeBSD"); return (100); --- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_SolarisOS_Utils.c 2014-07-15 23:24:38.000000000 -0700 @@ -76,7 +76,7 @@ adPath[*count].st_ino = statBuf.st_ino; adPath[*count].st_dev = statBuf.st_dev; @@ -88563,7 +91780,7 @@ TRACE1("Added audio device %s\n", path); } --- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -151,7 +151,6 @@ return rv; } @@ -88573,7 +91790,7 @@ Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this, jobject file, --- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -31,21 +31,24 @@ #ifdef __APPLE__ #include <crt_externs.h> @@ -88628,7 +91845,7 @@ const char * valBeg = varEnd + 1; jsize varLength = varEnd - environ[i]; --- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -47,19 +47,15 @@ #endif #include <signal.h> @@ -89562,7 +92779,7 @@ } --- ./jdk/src/solaris/native/java/lang/childproc.c 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/solaris/native/java/lang/childproc.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/childproc.c 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,387 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -89952,7 +93169,7 @@ + return 0; /* Suppress warning "no return value from function" */ +} --- ./jdk/src/solaris/native/java/lang/childproc.h 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/solaris/native/java/lang/childproc.h 2014-04-20 10:19:59.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/childproc.h 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,145 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -90100,7 +93317,7 @@ + +#endif --- ./jdk/src/solaris/native/java/lang/java_props_macosx.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/java_props_macosx.c 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/java_props_macosx.c 2014-07-15 23:24:38.000000000 -0700 @@ -31,6 +31,7 @@ #include <Security/AuthSession.h> #include <CoreFoundation/CoreFoundation.h> @@ -90132,7 +93349,7 @@ void setProxyProperties(java_props_t *sProps) { if (sProps == NULL) return; --- ./jdk/src/solaris/native/java/lang/java_props_macosx.h 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/java_props_macosx.h 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/java_props_macosx.h 2014-07-15 23:24:38.000000000 -0700 @@ -27,6 +27,7 @@ char *setupMacOSXLocale(int cat); @@ -90142,7 +93359,7 @@ enum PreferredToolkit_enum { --- ./jdk/src/solaris/native/java/lang/java_props_md.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -151,7 +151,7 @@ lc = setlocale(cat, NULL); #endif @@ -90215,7 +93432,7 @@ /* User TIMEZONE */ --- ./jdk/src/solaris/native/java/lang/jspawnhelper.c 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/solaris/native/java/lang/jspawnhelper.c 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/src/solaris/native/java/lang/jspawnhelper.c 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,149 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -90367,7 +93584,7 @@ + return 0; /* NOT REACHED */ +} --- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2014-07-15 23:24:38.000000000 -0700 @@ -122,7 +122,6 @@ static jclass ni_ia6cls; static jmethodID ni_ia4ctrID; @@ -90430,7 +93647,7 @@ (*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj); inet6Index++; --- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2014-06-06 19:56:35.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2014-07-15 23:24:38.000000000 -0700 @@ -60,14 +60,19 @@ #include <sys/param.h> #include <sys/ioctl.h> @@ -90554,7 +93771,7 @@ } --- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-06-06 19:56:35.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2014-07-15 23:24:38.000000000 -0700 @@ -23,12 +23,12 @@ * questions. */ @@ -90656,7 +93873,7 @@ memcpy((void *)&(mname6.ipv6mr_multiaddr), caddr, sizeof(struct in6_addr)); --- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2014-06-06 19:56:35.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2014-07-15 23:24:38.000000000 -0700 @@ -708,7 +708,6 @@ } else { ret = NET_Timeout(fd, timeout); @@ -90675,7 +93892,7 @@ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "Accept failed"); } --- ./jdk/src/solaris/native/java/net/SocketInputStream.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/SocketInputStream.c 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/SocketInputStream.c 2014-07-15 23:24:38.000000000 -0700 @@ -108,6 +108,8 @@ } else if (nread == JVM_IO_ERR) { if (errno == EBADF) { @@ -90686,7 +93903,7 @@ NET_ThrowByNameWithLastError(env, JNU_JAVANETPKG "SocketException", "select/poll failed"); --- ./jdk/src/solaris/native/java/net/bsd_close.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2014-06-06 19:56:35.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/bsd_close.c 2014-07-15 23:24:38.000000000 -0700 @@ -25,6 +25,7 @@ #include <stdio.h> @@ -90843,7 +94060,7 @@ +#endif } --- ./jdk/src/solaris/native/java/net/linux_close.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/linux_close.c 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/linux_close.c 2014-07-15 23:24:38.000000000 -0700 @@ -34,7 +34,6 @@ #include <sys/uio.h> #include <unistd.h> @@ -90888,7 +94105,7 @@ /* --- ./jdk/src/solaris/native/java/net/net_util_md.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/net_util_md.c 2014-06-06 19:56:35.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/net_util_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -45,6 +45,10 @@ #endif #endif @@ -91010,7 +94227,7 @@ return setsockopt(fd, level, opt, arg, len); } --- ./jdk/src/solaris/native/java/net/net_util_md.h 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/net/net_util_md.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/java/net/net_util_md.h 2014-07-15 23:24:38.000000000 -0700 @@ -37,7 +37,7 @@ #endif @@ -91031,7 +94248,7 @@ /* needed from libsocket on Solaris 8 */ --- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -123,7 +123,7 @@ return NULL; } @@ -91066,7 +94283,7 @@ -#endif /* MACOSX */ +#endif /* _ALLBSD_SOURCE */ --- ./jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. @@ -91099,7 +94316,7 @@ return target; --- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2014-07-15 23:24:38.000000000 -0700 @@ -334,7 +334,7 @@ if (strcmp(style, "regular") == 0) { altstyle = "roman"; @@ -91110,7 +94327,7 @@ family = "lucida"; } --- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2014-06-06 19:56:35.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. @@ -91224,7 +94441,7 @@ return point; } --- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2003, Oracle and/or its affiliates. All rights reserved. @@ -91233,7 +94450,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2014-07-15 23:24:38.000000000 -0700 @@ -67,7 +67,7 @@ XIMPreeditDrawCallbackStruct *); static void PreeditCaretCallback(XIC, XPointer, @@ -91474,7 +94691,7 @@ adjustStatusWindow(window); AWT_UNLOCK(); --- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved. @@ -91492,7 +94709,7 @@ len = strlen(buf); p = strrchr(buf, '/'); --- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2014-07-15 23:24:38.000000000 -0700 @@ -46,7 +46,7 @@ #include "wsutils.h" #include "list.h" @@ -91503,7 +94720,7 @@ #endif --- ./jdk/src/solaris/native/sun/awt/awt_util.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_util.c 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_util.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2003, Oracle and/or its affiliates. All rights reserved. @@ -91532,7 +94749,7 @@ extern jint getModifiers(uint32_t state, jint button, jint keyCode); extern jint getButton(uint32_t button); --- ./jdk/src/solaris/native/sun/awt/awt_util.h 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2014-06-06 19:56:35.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved. @@ -91591,7 +94808,7 @@ Cardinal num_refs; /* Number of referencing widgets. */ Cardinal max_refs; /* Maximum length of refs array. */ --- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2014-06-06 19:56:35.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2006, Oracle and/or its affiliates. All rights reserved. @@ -91764,7 +94981,7 @@ } else { --- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2014-07-15 23:24:38.000000000 -0700 @@ -45,7 +45,10 @@ KDE2_WM, SAWFISH_WM, @@ -91778,7 +94995,7 @@ extern void awt_wm_init(void); --- ./jdk/src/solaris/native/sun/awt/awt_xembed_server.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/awt_xembed_server.c 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/awt_xembed_server.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2005, Oracle and/or its affiliates. All rights reserved. @@ -91787,7 +95004,7 @@ * * This code is free software; you can redistribute it and/or modify it --- ./jdk/src/solaris/native/sun/awt/extutil.h 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/extutil.h 2014-07-15 23:24:38.000000000 -0700 @@ -58,7 +58,7 @@ */ /* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */ @@ -91804,7 +95021,7 @@ -#endif /* __linux__ || MACOSX */ +#endif /* __linux__ || _ALLBSD_SOURCE */ --- ./jdk/src/solaris/native/sun/awt/fontpath.c 2013-09-06 11:29:10.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2014-07-15 23:24:38.000000000 -0700 @@ -23,7 +23,7 @@ * questions. */ @@ -91883,7 +95100,7 @@ #endif #endif /* !HEADLESS */ --- ./jdk/src/solaris/native/sun/awt/robot_common.c 2013-09-06 11:29:11.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2014-07-15 23:24:38.000000000 -0700 @@ -27,7 +27,7 @@ #error This file should not be included in headless library #endif @@ -91894,7 +95111,7 @@ #endif --- ./jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c 2013-09-06 11:29:11.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c 2014-01-18 12:16:31.000000000 -0800 ++++ ./jdk/src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c 2014-07-15 23:24:38.000000000 -0700 @@ -577,8 +577,8 @@ SplashUnlock(splash); rc = poll(pfd, 2, timeout); @@ -91907,7 +95124,7 @@ SplashUpdateShape(splash); SplashRedrawWindow(splash); --- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2013-09-06 11:29:11.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2014-07-15 23:24:38.000000000 -0700 @@ -28,9 +28,9 @@ #include <sys/types.h> @@ -91921,7 +95138,7 @@ #endif /* __linux__ || MACOSX */ --- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2013-09-06 11:29:11.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2014-07-15 23:24:38.000000000 -0700 @@ -804,7 +804,7 @@ static int initialized; static int usevis = JNI_TRUE; @@ -91932,7 +95149,7 @@ #else # define ULTRA_CHIP "sun4u" --- ./jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/opengl/GLXSurfaceData.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -91956,7 +95173,7 @@ JNIEXPORT jboolean JNICALL --- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2014-06-06 19:56:35.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -91983,7 +95200,7 @@ /* --- ./jdk/src/solaris/native/sun/net/portconfig.c 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/solaris/native/sun/net/portconfig.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/net/portconfig.c 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -92126,7 +95343,7 @@ +} +#endif --- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2014-07-15 23:24:38.000000000 -0700 @@ -201,7 +201,7 @@ return IOS_THROWN; } @@ -92146,7 +95363,7 @@ if (numBytes > 0) --- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2014-07-15 23:24:38.000000000 -0700 @@ -227,6 +227,21 @@ fl.l_start = (off64_t)pos; fl.l_type = F_UNLCK; @@ -92169,8 +95386,58 @@ if (lockResult < 0) { JNU_ThrowIOExceptionWithLastError(env, "Release failed"); } +--- ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2013-09-06 11:29:12.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/NativeThread.c 2014-07-15 23:24:38.000000000 -0700 +@@ -33,12 +33,19 @@ + #include "nio_util.h" + + +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + #include <pthread.h> ++#if defined(__linux__) + #include <sys/signal.h> + + /* Also defined in src/solaris/native/java/net/linux_close.c */ + #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) ++#else ++#include <signal.h> ++ ++/* Also defined in src/solaris/native/java/net/bsd_close.c */ ++#define INTERRUPT_SIGNAL SIGIO ++#endif + + static void + nullHandler(int sig) +@@ -51,7 +58,7 @@ + JNIEXPORT void JNICALL + Java_sun_nio_ch_NativeThread_init(JNIEnv *env, jclass cl) + { +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + + /* Install the null handler for INTERRUPT_SIGNAL. This might overwrite the + * handler previously installed by java/net/linux_close.c, but that's okay +@@ -74,7 +81,7 @@ + JNIEXPORT jlong JNICALL + Java_sun_nio_ch_NativeThread_current(JNIEnv *env, jclass cl) + { +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + return (long)pthread_self(); + #else + return -1; +@@ -84,7 +91,7 @@ + JNIEXPORT void JNICALL + Java_sun_nio_ch_NativeThread_signal(JNIEnv *env, jclass cl, jlong thread) + { +-#ifdef __linux__ ++#if defined(__linux__) || defined(_ALLBSD_SOURCE) + if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL)) + JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed"); + #endif --- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2014-07-15 23:24:38.000000000 -0700 @@ -320,8 +320,20 @@ typedef int sctp_peeloff_func(int sock, sctp_assoc_t id); @@ -92211,7 +95478,7 @@ #endif /* !SUN_NIO_CH_SCTP_H */ --- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2014-06-06 19:56:35.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2014-07-15 23:24:38.000000000 -0700 @@ -38,8 +38,7 @@ #include "sun_nio_ch_SctpResultContainer.h" #include "sun_nio_ch_SctpPeerAddrChange.h" @@ -92294,7 +95561,7 @@ iov->iov_base = addr; iov->iov_len = length; --- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2014-07-15 23:24:38.000000000 -0700 @@ -58,6 +58,7 @@ */ jboolean loadSocketExtensionFuncs @@ -92312,7 +95579,7 @@ funcsLoaded = JNI_TRUE; return JNI_TRUE; --- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -33,6 +33,11 @@ #include "j2secmod.h" @@ -92348,7 +95615,7 @@ dprintf2("-handle: %u (0X%X)\n", hModule, hModule); --- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2014-07-15 23:24:38.000000000 -0700 @@ -867,7 +867,7 @@ { KeySym originalKeysym = *keysym; @@ -92359,7 +95626,7 @@ * not to echo on JTextField when the NumLock is on. The * keysyms will be 0, because the last parameter 2 is not defined. --- ./jdk/src/solaris/native/sun/xawt/XlibWrapper.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/solaris/native/sun/xawt/XlibWrapper.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/solaris/native/sun/xawt/XlibWrapper.c 2014-07-15 23:24:38.000000000 -0700 @@ -41,6 +41,7 @@ #include <sizecalc.h> @@ -92387,7 +95654,7 @@ } return 0; --- ./jdk/src/windows/back/linker_md.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/windows/back/linker_md.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/back/linker_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -39,33 +39,27 @@ #include "path_md.h" @@ -92447,7 +95714,7 @@ const int pnamelen = pname ? (int)strlen(pname) : 0; --- ./jdk/src/windows/bin/cmdtoargs.c 2013-09-06 11:29:12.000000000 -0700 -+++ ./jdk/src/windows/bin/cmdtoargs.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/bin/cmdtoargs.c 2014-07-15 23:24:38.000000000 -0700 @@ -53,6 +53,16 @@ static StdArg *stdargs; static int stdargc; @@ -92605,8 +95872,25 @@ } } *dest = 0; +--- ./jdk/src/windows/bin/java_md.c 2013-09-06 11:29:12.000000000 -0700 ++++ ./jdk/src/windows/bin/java_md.c 2014-07-15 23:24:38.000000000 -0700 +@@ -1301,6 +1301,14 @@ + /* save path length */ + jrePathLen = JLI_StrLen(libraryPath); + ++ if (jrePathLen + JLI_StrLen("\\bin\\verify.dll") >= MAXPATHLEN) { ++ /* jre path is too long, the library path will not fit there; ++ * report and abort preloading ++ */ ++ JLI_ReportErrorMessage(JRE_ERROR11); ++ break; ++ } ++ + /* load msvcrt 1st */ + LoadMSVCRT(); + --- ./jdk/src/windows/classes/java/lang/ProcessImpl.java 2013-09-06 11:29:13.000000000 -0700 -+++ ./jdk/src/windows/classes/java/lang/ProcessImpl.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/java/lang/ProcessImpl.java 2014-07-15 23:24:38.000000000 -0700 @@ -457,8 +457,10 @@ /** @@ -92629,7 +95913,7 @@ String dir, long[] stdHandles, --- ./jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java 2013-09-06 11:29:13.000000000 -0700 -+++ ./jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/java/net/DualStackPlainSocketImpl.java 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. @@ -92649,7 +95933,7 @@ void socketShutdown(int howto) throws IOException { --- ./jdk/src/windows/classes/java/net/PlainSocketImpl.java 2013-09-06 11:29:13.000000000 -0700 -+++ ./jdk/src/windows/classes/java/net/PlainSocketImpl.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/java/net/PlainSocketImpl.java 2014-07-15 23:24:38.000000000 -0700 @@ -191,14 +191,17 @@ } @@ -92676,8 +95960,30 @@ } void setFileDescriptor(FileDescriptor fd) { +--- ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java 2013-09-06 11:29:13.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolder2.java 2014-07-15 23:24:38.000000000 -0700 +@@ -583,11 +583,18 @@ + + // Needs to be accessible to Win32ShellFolderManager2 + static String getFileSystemPath(final int csidl) throws IOException, InterruptedException { +- return invoke(new Callable<String>() { ++ String path = invoke(new Callable<String>() { + public String call() throws IOException { + return getFileSystemPath0(csidl); + } + }, IOException.class); ++ if (path != null) { ++ SecurityManager security = System.getSecurityManager(); ++ if (security != null) { ++ security.checkRead(path); ++ } ++ } ++ return path; + } + + // NOTE: this method uses COM and must be called on the 'COM thread'. See ComInvoker for the details --- ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java 2013-09-06 11:29:13.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -92693,7 +95999,52 @@ // NOTE: This class supersedes Win32ShellFolderManager, which was removed // from distribution after version 1.4.2. -@@ -505,23 +506,19 @@ +@@ -137,6 +138,8 @@ + if (desktop == null) { + try { + desktop = new Win32ShellFolder2(DESKTOP); ++ } catch (SecurityException e) { ++ // Ignore error + } catch (IOException e) { + // Ignore error + } catch (InterruptedException e) { +@@ -150,6 +153,8 @@ + if (drives == null) { + try { + drives = new Win32ShellFolder2(DRIVES); ++ } catch (SecurityException e) { ++ // Ignore error + } catch (IOException e) { + // Ignore error + } catch (InterruptedException e) { +@@ -166,6 +171,8 @@ + if (path != null) { + recent = createShellFolder(getDesktop(), new File(path)); + } ++ } catch (SecurityException e) { ++ // Ignore error + } catch (InterruptedException e) { + // Ignore error + } catch (IOException e) { +@@ -179,6 +186,8 @@ + if (network == null) { + try { + network = new Win32ShellFolder2(NETWORK); ++ } catch (SecurityException e) { ++ // Ignore error + } catch (IOException e) { + // Ignore error + } catch (InterruptedException e) { +@@ -202,6 +211,8 @@ + personal.setIsPersonal(); + } + } ++ } catch (SecurityException e) { ++ // Ignore error + } catch (InterruptedException e) { + // Ignore error + } catch (IOException e) { +@@ -505,23 +516,19 @@ } } }; @@ -92726,8 +96077,58 @@ ); return comThread; } +--- ./jdk/src/windows/classes/sun/awt/windows/ThemeReader.java 2013-09-06 11:29:13.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/awt/windows/ThemeReader.java 2014-07-15 23:24:38.000000000 -0700 +@@ -56,18 +56,12 @@ + new ReentrantReadWriteLock(); + private static final Lock readLock = readWriteLock.readLock(); + private static final Lock writeLock = readWriteLock.writeLock(); ++ private static volatile boolean valid = false; + + static void flush() { +- writeLock.lock(); +- try { +- // Close old themes. +- for (Long value : widgetToTheme.values()) { +- closeTheme(value.longValue()); +- } +- widgetToTheme.clear(); +- } finally { +- writeLock.unlock(); +- } ++ // Could be called on Toolkit thread, so do not try to aquire locks ++ // to avoid deadlock with theme initialization ++ valid = false; + } + + public native static boolean isThemed(); +@@ -94,6 +88,24 @@ + // returns theme value + // this method should be invoked with readLock locked + private static Long getTheme(String widget) { ++ if (!valid) { ++ readLock.unlock(); ++ writeLock.lock(); ++ try { ++ if (!valid) { ++ // Close old themes. ++ for (Long value : widgetToTheme.values()) { ++ closeTheme(value); ++ } ++ widgetToTheme.clear(); ++ valid = true; ++ } ++ } finally { ++ readLock.lock(); ++ writeLock.unlock(); ++ } ++ } ++ + // mostly copied from the javadoc for ReentrantReadWriteLock + Long theme = widgetToTheme.get(widget); + if (theme == null) { --- ./jdk/src/windows/classes/sun/awt/windows/WClipboard.java 2013-09-06 11:29:13.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/awt/windows/WClipboard.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/awt/windows/WClipboard.java 2014-07-15 23:24:38.000000000 -0700 @@ -63,7 +63,6 @@ } @@ -92746,7 +96147,7 @@ openClipboard(this); --- ./jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java 2013-09-06 11:29:13.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/awt/windows/WPrinterJob.java 2014-07-15 23:24:38.000000000 -0700 @@ -179,6 +179,7 @@ private static final int SET_RES_LOW = 0x00000080; private static final int SET_COLOR = 0x00000200; @@ -93133,7 +96534,7 @@ class PrintToFileErrorDialog extends Dialog implements ActionListener{ public PrintToFileErrorDialog(Frame parent, String title, String message, --- ./jdk/src/windows/classes/sun/awt/windows/WToolkit.java 2013-09-06 11:29:13.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/awt/windows/WToolkit.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/awt/windows/WToolkit.java 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. @@ -93210,16 +96611,42 @@ boolean startPump = init(); if (startPump) { -@@ -856,6 +865,7 @@ +@@ -855,11 +864,18 @@ + * Windows doesn't always send WM_SETTINGCHANGE when it should. */ private void windowsSettingChange() { - EventQueue.invokeLater(new Runnable() { -+ @Override - public void run() { - updateProperties(); - } +- EventQueue.invokeLater(new Runnable() { +- public void run() { +- updateProperties(); +- } +- }); ++ if (AppContext.getAppContext() == null) { ++ // We cannot post the update to any EventQueue. Listeners will ++ // be called on EDTs by DesktopPropertyChangeSupport ++ updateProperties(); ++ } else { ++ EventQueue.invokeLater(new Runnable() { ++ @Override ++ public void run() { ++ updateProperties(); ++ } ++ }); ++ } + } + + private synchronized void updateProperties() { +--- ./jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java 2013-09-06 11:29:13.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/awt/windows/WWindowPeer.java 2014-07-15 23:24:38.000000000 -0700 +@@ -421,6 +421,7 @@ + */ + public static long[] getActiveWindowHandles() { + AppContext appContext = AppContext.getAppContext(); ++ if (appContext == null) return null; + synchronized (appContext) { + List<WWindowPeer> l = (List<WWindowPeer>)appContext.get(ACTIVE_WINDOWS_KEY); + if (l == null) { --- ./jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java 2013-09-06 11:29:13.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/java2d/d3d/D3DScreenUpdateManager.java 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. @@ -93319,7 +96746,7 @@ } else { wakeUpUpdateThread(); --- ./jdk/src/windows/classes/sun/net/PortConfig.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/windows/classes/sun/net/PortConfig.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/windows/classes/sun/net/PortConfig.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -93387,7 +96814,7 @@ + } +} --- ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java 2013-09-06 11:29:14.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousFileChannelImpl.java 2014-07-15 23:24:38.000000000 -0700 @@ -230,6 +230,7 @@ @Override public void run() { @@ -93418,7 +96845,7 @@ } --- ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java 2013-09-06 11:29:14.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/windows/classes/sun/nio/ch/WindowsAsynchronousSocketChannelImpl.java 2014-07-15 23:24:38.000000000 -0700 @@ -31,6 +31,9 @@ import java.net.*; import java.util.concurrent.*; @@ -93464,7 +96891,7 @@ bindException = x; } --- ./jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java 2013-09-06 11:29:14.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/nio/fs/WindowsConstants.java 2014-07-15 23:24:38.000000000 -0700 @@ -100,6 +100,7 @@ public static final int ERROR_INVALID_LEVEL = 124; public static final int ERROR_DIR_NOT_EMPTY = 145; @@ -93474,7 +96901,7 @@ public static final int ERROR_NOTIFY_ENUM_DIR = 1022; public static final int ERROR_NONE_MAPPED = 1332; --- ./jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java 2013-09-06 11:29:14.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/nio/fs/WindowsNativeDispatcher.java 2014-07-15 23:24:38.000000000 -0700 @@ -973,19 +973,19 @@ * HANDLE CreateIoCompletionPort ( * HANDLE FileHandle, @@ -93529,7 +96956,7 @@ /** * ReadDirectoryChangesW( --- ./jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java 2013-09-06 11:29:14.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/nio/fs/WindowsWatchService.java 2014-07-15 23:24:38.000000000 -0700 @@ -41,6 +41,7 @@ class WindowsWatchService extends AbstractWatchService @@ -93776,7 +97203,7 @@ key.signal(); } --- ./jdk/src/windows/classes/sun/print/Win32MediaTray.java 2013-09-06 11:29:14.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/print/Win32MediaTray.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/print/Win32MediaTray.java 2014-07-15 23:24:38.000000000 -0700 @@ -70,6 +70,10 @@ winEnumTable.add(this); } @@ -93789,7 +97216,7 @@ "Manual-Envelope", "Automatic-Feeder", --- ./jdk/src/windows/classes/sun/print/Win32PrintService.java 2013-09-06 11:29:14.000000000 -0700 -+++ ./jdk/src/windows/classes/sun/print/Win32PrintService.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/classes/sun/print/Win32PrintService.java 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. @@ -94179,7 +97606,7 @@ } } --- ./jdk/src/windows/demo/jvmti/hprof/hprof_md.c 2013-09-06 11:29:14.000000000 -0700 -+++ ./jdk/src/windows/demo/jvmti/hprof/hprof_md.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/demo/jvmti/hprof/hprof_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -368,37 +368,32 @@ } @@ -94235,7 +97662,7 @@ int pnamelen; --- ./jdk/src/windows/native/java/lang/ProcessImpl_md.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/java/lang/ProcessImpl_md.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/native/java/lang/ProcessImpl_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -94733,7 +98160,7 @@ JNIEXPORT jint JNICALL --- ./jdk/src/windows/native/java/lang/java_props_md.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/java/lang/java_props_md.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/windows/native/java/lang/java_props_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. @@ -94758,7 +98185,7 @@ } } --- ./jdk/src/windows/native/java/net/Inet6AddressImpl.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/java/net/Inet6AddressImpl.c 2013-12-01 11:14:37.000000000 -0800 ++++ ./jdk/src/windows/native/java/net/Inet6AddressImpl.c 2014-07-15 23:24:38.000000000 -0700 @@ -77,7 +77,6 @@ static jclass ni_ia6cls; static jmethodID ni_ia4ctrID; @@ -94808,7 +98235,7 @@ (*env)->SetObjectArrayElement(env, ret, inet6Index, iaObj); inet6Index ++; --- ./jdk/src/windows/native/java/net/NetworkInterface.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/java/net/NetworkInterface.c 2013-12-01 11:14:37.000000000 -0800 ++++ ./jdk/src/windows/native/java/net/NetworkInterface.c 2014-07-15 23:24:38.000000000 -0700 @@ -72,8 +72,6 @@ jclass ni_ia6cls; /* Inet6Address */ @@ -94852,7 +98279,7 @@ if (ibObj == NULL) { free_netaddr(netaddrP); --- ./jdk/src/windows/native/java/net/NetworkInterface_winXP.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/java/net/NetworkInterface_winXP.c 2013-12-01 11:14:37.000000000 -0800 ++++ ./jdk/src/windows/native/java/net/NetworkInterface_winXP.c 2014-07-15 23:24:38.000000000 -0700 @@ -499,19 +499,15 @@ int scope; iaObj = (*env)->NewObject(env, ni_ia6cls, ni_ia6ctrID); @@ -94878,7 +98305,7 @@ if (ibObj == NULL) { free_netaddr(netaddrP); --- ./jdk/src/windows/native/java/net/SocketInputStream.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/java/net/SocketInputStream.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/native/java/net/SocketInputStream.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2003, Oracle and/or its affiliates. All rights reserved. @@ -94947,7 +98374,7 @@ } } --- ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c 2013-12-01 11:14:37.000000000 -0800 ++++ ./jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c 2014-07-15 23:24:38.000000000 -0700 @@ -728,7 +728,6 @@ setInetAddress_family(env, socketAddressObj, IPv4); (*env)->SetObjectField(env, socket, psi_addressID, socketAddressObj); @@ -94971,7 +98398,7 @@ /* fields common to AF_INET and AF_INET6 */ --- ./jdk/src/windows/native/java/net/net_util_md.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/java/net/net_util_md.c 2013-12-01 11:14:37.000000000 -0800 ++++ ./jdk/src/windows/native/java/net/net_util_md.c 2014-07-15 23:24:38.000000000 -0700 @@ -851,7 +851,6 @@ family = (iafam == IPv4)? AF_INET : AF_INET6; if (ipv6_available() && !(family == AF_INET && v4MappedAddress == JNI_FALSE)) { @@ -94994,7 +98421,7 @@ memset((char *)him6, 0, sizeof(struct SOCKADDR_IN6)); --- ./jdk/src/windows/native/sun/font/fontpath.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/sun/font/fontpath.c 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/windows/native/sun/font/fontpath.c 2014-07-15 23:24:38.000000000 -0700 @@ -185,6 +185,12 @@ return 0; } @@ -95089,7 +98516,7 @@ + screenDC = NULL; } --- ./jdk/src/windows/native/sun/net/portconfig.c 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/src/windows/native/sun/net/portconfig.c 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/src/windows/native/sun/net/portconfig.c 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -95198,7 +98625,7 @@ +} +#endif --- ./jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/native/sun/nio/ch/SocketDispatcher.c 2014-07-15 23:24:38.000000000 -0700 @@ -192,45 +192,66 @@ jobject fdo, jlong address, jint len) { @@ -95298,7 +98725,7 @@ JNIEXPORT void JNICALL --- ./jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/native/sun/nio/fs/WindowsNativeDispatcher.c 2014-07-15 23:24:38.000000000 -0700 @@ -162,7 +162,7 @@ } completionStatus_error = (*env)->GetFieldID(env, clazz, "error", "I"); @@ -95369,7 +98796,7 @@ (LPVOID)jlong_to_ptr(bufferAddress), (DWORD)bufferLength, --- ./jdk/src/windows/native/sun/security/krb5/NativeCreds.c 2013-09-06 11:29:15.000000000 -0700 -+++ ./jdk/src/windows/native/sun/security/krb5/NativeCreds.c 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/native/sun/security/krb5/NativeCreds.c 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. @@ -95527,8 +98954,31 @@ // clean up resources if (TktCacheResponse != NULL) { +--- ./jdk/src/windows/native/sun/windows/awt_Component.cpp 2013-09-06 11:29:16.000000000 -0700 ++++ ./jdk/src/windows/native/sun/windows/awt_Component.cpp 2014-07-15 23:24:38.000000000 -0700 +@@ -1719,9 +1719,11 @@ + case WM_IME_SETCONTEXT: + // lParam is passed as pointer and it can be modified. + mr = WmImeSetContext(static_cast<BOOL>(wParam), &lParam); ++ CallProxyDefWindowProc(message, wParam, lParam, retValue, mr); + break; + case WM_IME_NOTIFY: + mr = WmImeNotify(wParam, lParam); ++ CallProxyDefWindowProc(message, wParam, lParam, retValue, mr); + break; + case WM_IME_STARTCOMPOSITION: + mr = WmImeStartComposition(); +@@ -4066,7 +4068,7 @@ + { + if (mr != mrConsume) { + HWND proxy = GetProxyFocusOwner(); +- if (proxy != NULL) { ++ if (proxy != NULL && ::IsWindowEnabled(proxy)) { + retVal = ComCtl32Util::GetInstance().DefWindowProc(NULL, proxy, message, wParam, lParam); + mr = mrConsume; + } --- ./jdk/src/windows/native/sun/windows/awt_FileDialog.cpp 2013-09-06 11:29:16.000000000 -0700 -+++ ./jdk/src/windows/native/sun/windows/awt_FileDialog.cpp 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/native/sun/windows/awt_FileDialog.cpp 2014-07-15 23:24:38.000000000 -0700 @@ -372,7 +372,9 @@ // Report result to peer. @@ -95540,8 +98990,19 @@ jcharArray jnames = env->NewCharArray(length); env->SetCharArrayRegion(jnames, 0, length, (jchar*)ofn.lpstrFile); +--- ./jdk/src/windows/native/sun/windows/awt_Frame.cpp 2013-09-06 11:29:16.000000000 -0700 ++++ ./jdk/src/windows/native/sun/windows/awt_Frame.cpp 2014-07-15 23:24:38.000000000 -0700 +@@ -319,6 +319,8 @@ + case WM_IME_STARTCOMPOSITION: + case WM_IME_ENDCOMPOSITION: + case WM_IME_COMPOSITION: ++ case WM_IME_SETCONTEXT: ++ case WM_IME_NOTIFY: + case WM_IME_CONTROL: + case WM_IME_COMPOSITIONFULL: + case WM_IME_SELECT: --- ./jdk/src/windows/native/sun/windows/awt_PrintControl.cpp 2013-09-06 11:29:16.000000000 -0700 -+++ ./jdk/src/windows/native/sun/windows/awt_PrintControl.cpp 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/native/sun/windows/awt_PrintControl.cpp 2014-07-15 23:24:38.000000000 -0700 @@ -81,6 +81,7 @@ jmethodID AwtPrintControl::setNativeAttID; jmethodID AwtPrintControl::setRangeCopiesID; @@ -95570,7 +99031,7 @@ CATCH_BAD_ALLOC; --- ./jdk/src/windows/native/sun/windows/awt_PrintControl.h 2013-09-06 11:29:16.000000000 -0700 -+++ ./jdk/src/windows/native/sun/windows/awt_PrintControl.h 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/native/sun/windows/awt_PrintControl.h 2014-07-15 23:24:38.000000000 -0700 @@ -47,7 +47,6 @@ static jmethodID setDevmodeID; static jmethodID getDevnamesID; @@ -95588,7 +99049,7 @@ static void initIDs(JNIEnv *env, jclass cls); static BOOL FindPrinter(jstring printerName, LPBYTE pPrinterEnum, --- ./jdk/src/windows/native/sun/windows/awt_PrintJob.cpp 2013-09-06 11:29:16.000000000 -0700 -+++ ./jdk/src/windows/native/sun/windows/awt_PrintJob.cpp 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/src/windows/native/sun/windows/awt_PrintJob.cpp 2014-07-15 23:24:38.000000000 -0700 @@ -329,6 +329,156 @@ static int embolden(int currentWeight); static BOOL getPrintableArea(HDC pdc, HANDLE hDevMode, RectDouble *margin); @@ -95786,7 +99247,7 @@ CATCH_BAD_ALLOC; --- ./jdk/src/windows/native/sun/windows/awt_Toolkit.cpp 2013-09-06 11:29:17.000000000 -0700 -+++ ./jdk/src/windows/native/sun/windows/awt_Toolkit.cpp 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/windows/native/sun/windows/awt_Toolkit.cpp 2014-07-15 23:24:38.000000000 -0700 @@ -365,6 +365,7 @@ HANDLE hCompleted; @@ -95835,7 +99296,7 @@ return result ? JNI_TRUE : JNI_FALSE; } --- ./jdk/src/windows/resource/java.manifest 2013-09-06 11:29:17.000000000 -0700 -+++ ./jdk/src/windows/resource/java.manifest 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/src/windows/resource/java.manifest 2014-07-15 23:24:38.000000000 -0700 @@ -44,9 +44,15 @@ <!-- Indicate this JDK version is Windows 7 compatible --> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> @@ -95855,7 +99316,7 @@ </assembly> --- ./jdk/test/Makefile 2013-09-06 11:29:17.000000000 -0700 -+++ ./jdk/test/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/Makefile 2014-07-15 23:24:41.000000000 -0700 @@ -79,6 +79,11 @@ endif OS_VERSION := $(shell $(UNAME) -r) @@ -95869,7 +99330,7 @@ OS_NAME = macosx OS_ARCH := $(shell $(UNAME) -m) --- ./jdk/test/ProblemList.txt 2013-09-06 11:29:17.000000000 -0700 -+++ ./jdk/test/ProblemList.txt 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/ProblemList.txt 2014-07-15 23:24:41.000000000 -0700 @@ -369,15 +369,6 @@ # 7147060 com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java generic-all @@ -95897,7 +99358,7 @@ --- ./jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/com/apple/eawt/DefaultMenuBar/DefaultMenuBarTest.java 2014-07-15 23:24:41.000000000 -0700 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -96008,7 +99469,7 @@ + } +} --- ./jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/test/com/sun/corba/se/impl/orb/SetDefaultORBTest.java 2014-07-15 23:24:41.000000000 -0700 @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -96072,7 +99533,7 @@ + } +} --- ./jdk/test/com/sun/corba/transport/KeepAliveSockets.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/com/sun/corba/transport/KeepAliveSockets.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/com/sun/corba/transport/KeepAliveSockets.java 2014-07-15 23:24:41.000000000 -0700 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -96143,7 +99604,7 @@ + +} --- ./jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java 2014-01-18 12:16:22.000000000 -0800 ++++ ./jdk/test/com/sun/crypto/provider/TLS/TestLeadingZeroes.java 2014-07-15 23:24:41.000000000 -0700 @@ -0,0 +1,420 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -96566,7 +100027,7 @@ +} + --- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2013-09-06 11:29:18.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2014-07-15 23:24:41.000000000 -0700 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -96577,7 +100038,7 @@ ;; --- ./jdk/test/com/sun/jdi/JITDebug.sh 2013-09-06 11:29:18.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/JITDebug.sh 2014-07-15 23:24:41.000000000 -0700 @@ -63,7 +63,7 @@ OS=`uname -s` export TRANSPORT_METHOD @@ -96588,7 +100049,7 @@ TRANSPORT_METHOD=dt_socket ;; --- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2013-09-06 11:29:18.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2014-07-15 23:24:41.000000000 -0700 @@ -123,7 +123,7 @@ esac libloc=${jreloc}/lib/${libarch} @@ -96599,7 +100060,7 @@ libloc=`dirname ${xx}` ;; --- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2013-09-06 11:29:19.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2014-07-15 23:24:41.000000000 -0700 @@ -293,7 +293,7 @@ psCmd=ps jstack=jstack.exe @@ -96610,7 +100071,7 @@ address= devnull=/dev/null --- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2013-09-06 11:29:19.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2014-07-15 23:24:41.000000000 -0700 @@ -112,7 +112,7 @@ fi ;; @@ -96621,7 +100082,7 @@ ;; --- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2013-09-06 11:29:19.000000000 -0700 -+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2014-07-15 23:24:41.000000000 -0700 @@ -45,7 +45,7 @@ OS=`uname -s` @@ -96632,7 +100093,7 @@ ;; Windows* | CYGWIN*) --- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2013-09-06 11:29:19.000000000 -0700 -+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2014-07-15 23:24:41.000000000 -0700 @@ -72,6 +72,16 @@ done } @@ -96661,7 +100122,7 @@ # $ sysctl -n vm.swapusage # total = 8192.00M used = 7471.11M free = 720.89M (encrypted) --- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2013-09-06 11:29:19.000000000 -0700 -+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2014-07-15 23:24:41.000000000 -0700 @@ -48,7 +48,7 @@ # Test GetMaxFileDescriptorCount if we are running on Unix @@ -96672,7 +100133,7 @@ ;; * ) --- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2013-09-06 11:29:19.000000000 -0700 -+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2014-07-15 23:24:41.000000000 -0700 @@ -48,7 +48,7 @@ # Test GetOpenFileDescriptorCount if we are running on Unix @@ -96683,7 +100144,7 @@ ;; * ) --- ./jdk/test/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/com/sun/nio/sctp/SctpChannel/ReceiveIntoDirect.java 2014-07-15 23:24:41.000000000 -0700 @@ -0,0 +1,276 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -96962,7 +100423,7 @@ + +} --- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2013-09-06 11:29:21.000000000 -0700 -+++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2014-07-15 23:24:41.000000000 -0700 @@ -36,7 +36,7 @@ OS=`uname -s` @@ -96973,7 +100434,7 @@ FS="/" ;; --- ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java 2013-09-06 11:29:21.000000000 -0700 -+++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/InterprocessMessages.java 2014-07-15 23:24:39.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -96989,7 +100450,7 @@ } --- ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html 2013-09-06 11:29:21.000000000 -0700 -+++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.html 2014-07-15 23:24:39.000000000 -0700 @@ -1,18 +1,39 @@ <html> -<!-- @@ -97037,7 +100498,7 @@ <title>Java 7 on mac os x only provides text clipboard formats</title> </head> --- ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java 2013-09-06 11:29:21.000000000 -0700 -+++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/DataFlavor/MissedHtmlAndRtfBug/MissedHtmlAndRtfBug.java 2014-07-15 23:24:39.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -97117,8 +100578,219 @@ } +--- ./jdk/test/java/awt/Focus/8013611/JDK8013611.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/java/awt/Focus/8013611/JDK8013611.java 2014-07-15 23:24:39.000000000 -0700 +@@ -0,0 +1,111 @@ ++/* ++ * Copyright (c) 2014, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++/* ++ @test ++ @bug 8013611 ++ @summary Tests showing a modal dialog with requesting focus in frame. ++ @author Anton.Tarasov: area=awt.focus ++ @library ../../regtesthelpers ++ @build Util ++ @run main JDK8013611 ++*/ ++ ++import java.awt.*; ++import java.awt.event.*; ++import javax.swing.*; ++import test.java.awt.regtesthelpers.Util; ++ ++import java.awt.*; ++ ++public class JDK8013611 extends JFrame { ++ static JTextField textField = new JTextField("text"); ++ static JButton button1 = new JButton("button1"); ++ static JButton button2 = new JButton("button2"); ++ static Robot robot; ++ ++ static JDialog dialog; ++ static JButton button3 = new JButton("button3"); ++ ++ public static void main(String[] args) { ++ robot = Util.createRobot(); ++ ++ JDK8013611 frame = new JDK8013611(); ++ frame.setLayout(new FlowLayout()); ++ frame.add(textField); ++ frame.add(button1); ++ frame.add(button2); ++ frame.pack(); ++ ++ dialog = new JDialog(frame, true); ++ dialog.add(button3); ++ dialog.pack(); ++ ++ textField.addFocusListener(new FocusAdapter() { ++ @Override ++ public void focusLost(FocusEvent e) { ++ dialog.setVisible(true); ++ } ++ }); ++ ++ button1.addFocusListener(new FocusAdapter() { ++ @Override ++ public void focusGained(FocusEvent e) { ++ button2.requestFocusInWindow(); ++ } ++ }); ++ ++ frame.setVisible(true); ++ ++ frame.test(); ++ } ++ ++ public void test() { ++ if (!testFocused(textField)) { ++ Util.clickOnComp(textField, robot); ++ if (!testFocused(textField)) { ++ throw new RuntimeException("Error: couldn't focus " + textField); ++ } ++ } ++ ++ robot.keyPress(KeyEvent.VK_TAB); ++ robot.delay(50); ++ robot.keyRelease(KeyEvent.VK_TAB); ++ ++ if (!testFocused(button3)) { ++ throw new RuntimeException("Test failed: dialog didn't get focus!"); ++ } ++ ++ System.out.println("Test passed."); ++ } ++ ++ boolean testFocused(Component c) { ++ for (int i=0; i<10; i++) { ++ if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() == c) { ++ return true; ++ } ++ Util.waitForIdle(robot); ++ } ++ return false; ++ } ++} +--- ./jdk/test/java/awt/Focus/DialogTraversFocusBackTest/DialogTraversFocusBackTest.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/java/awt/Focus/DialogTraversFocusBackTest/DialogTraversFocusBackTest.java 2014-07-15 23:24:39.000000000 -0700 +@@ -0,0 +1,94 @@ ++/* ++ * Copyright (c) 2014, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++/* @test ++ @bug 8031075 ++ @summary Regression: focus disappears with shift+tab on dialogue having a focus component ++ @author mcherkas ++ @run main DialogTraversFocusBackTest ++*/ ++ ++import sun.awt.SunToolkit; ++ ++import javax.swing.*; ++import java.awt.*; ++import java.awt.event.KeyEvent; ++ ++public class DialogTraversFocusBackTest { ++ ++ private static Robot robot; ++ private volatile static JButton button; ++ private static Component currentFocusOwner; ++ ++ public static void main(String[] args) throws Exception { ++ initUI(); ++ sync(); ++ initRobot(); ++ runScript(); ++ sync(); ++ validate(); ++ } ++ ++ public static void sync() { ++ SunToolkit toolkit = (SunToolkit) Toolkit.getDefaultToolkit(); ++ toolkit.realSync(); ++ } ++ ++ private static void validate() throws Exception { ++ currentFocusOwner = FocusManager.getCurrentKeyboardFocusManager().getFocusOwner(); ++ if(currentFocusOwner ++ != button) { ++ throw new Exception("Test failed! Wrong focus owner: " + ++ String.valueOf(currentFocusOwner) + "\n but must be: " + ++ button); ++ } ++ } ++ ++ private static void runScript() { ++ robot.keyPress(KeyEvent.VK_SHIFT); ++ robot.keyPress(KeyEvent.VK_TAB); ++ robot.keyRelease(KeyEvent.VK_TAB); ++ robot.keyRelease(KeyEvent.VK_SHIFT); ++ ++ } ++ ++ private static void initRobot() throws AWTException { ++ robot = new Robot(); ++ robot.setAutoDelay(100); ++ ++ } ++ ++ private static void initUI() throws Exception { ++ SwingUtilities.invokeAndWait( new Runnable() { ++ @Override ++ public void run() { ++ JDialog dialog = new JDialog((Frame)null, "Test Dialog"); ++ button = new JButton("Button 1"); ++ dialog.add(button); ++ dialog.pack(); ++ dialog.setVisible(true); ++ } ++ }); ++ ++ } ++} --- ./jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,144 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -97264,8 +100936,19 @@ + } + } +} +--- ./jdk/test/java/awt/Frame/7024749/bug7024749.java 2013-09-06 11:29:22.000000000 -0700 ++++ ./jdk/test/java/awt/Frame/7024749/bug7024749.java 2014-07-15 23:24:39.000000000 -0700 +@@ -23,7 +23,7 @@ + + /* + * @test +- * @bug 7024749 7184326 ++ * @bug 7024749 7184326 8019990 + * @summary JDK7 b131---a crash in: Java_sun_awt_windows_ThemeReader_isGetThemeTransitionDurationDefined+0x75 + * @library ../../regtesthelpers + * @build Util --- ./jdk/test/java/awt/Frame/DefaultUnixIcon/TestUnixDefaultIcon.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/Frame/DefaultUnixIcon/TestUnixDefaultIcon.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/Frame/DefaultUnixIcon/TestUnixDefaultIcon.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,448 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -97716,7 +101399,7 @@ + +}// TestDialog class --- ./jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java 2013-09-06 11:29:22.000000000 -0700 -+++ ./jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java 2014-07-15 23:24:39.000000000 -0700 @@ -42,6 +42,7 @@ GraphicsDevice gd = ge.getDefaultScreenDevice(); @@ -97726,7 +101409,7 @@ // First, check it can be made fullscreen window without any effects applied --- ./jdk/test/java/awt/Graphics2D/DrawString/DrawRotatedString.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/Graphics2D/DrawString/DrawRotatedString.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/test/java/awt/Graphics2D/DrawString/DrawRotatedString.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -97810,7 +101493,7 @@ + } +} --- ./jdk/test/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/test/java/awt/Graphics2D/IncorrectTextSize/IncorrectTextSize.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -97890,7 +101573,7 @@ + } +} --- ./jdk/test/java/awt/JAWT/JAWT.sh 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/JAWT/JAWT.sh 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/JAWT/JAWT.sh 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,173 @@ +#!/bin/sh + @@ -98066,7 +101749,7 @@ +exit $? + --- ./jdk/test/java/awt/JAWT/Makefile.cygwin 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/JAWT/Makefile.cygwin 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/JAWT/Makefile.cygwin 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,49 @@ +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98118,7 +101801,7 @@ + $(DEL) mylib.* *.h *.class *.o + --- ./jdk/test/java/awt/JAWT/Makefile.unix 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/JAWT/Makefile.unix 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/JAWT/Makefile.unix 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,48 @@ +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98169,7 +101852,7 @@ +clean: + rm -rf libmylib.so $(HEADERS) $(CLASSES) $(OBJS) --- ./jdk/test/java/awt/JAWT/Makefile.win 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/JAWT/Makefile.win 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/JAWT/Makefile.win 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,47 @@ +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98219,7 +101902,7 @@ + $(DEL) $(HEADERS) $(CLASSES) + $(DEL) *.obj --- ./jdk/test/java/awt/JAWT/MyCanvas.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/JAWT/MyCanvas.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/JAWT/MyCanvas.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,72 @@ +/** + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -98294,7 +101977,7 @@ + } +} --- ./jdk/test/java/awt/JAWT/myfile.c 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/JAWT/myfile.c 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/JAWT/myfile.c 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -98403,7 +102086,7 @@ + awt.FreeDrawingSurface(ds); +} --- ./jdk/test/java/awt/JAWT/myfile.cpp 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/JAWT/myfile.cpp 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/JAWT/myfile.cpp 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -98516,7 +102199,7 @@ + +} --- ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.html 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,43 @@ +<html> +<!-- @@ -98562,7 +102245,7 @@ +</html> + --- ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/List/FirstItemRemoveTest/FirstItemRemoveTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -98684,7 +102367,7 @@ + +}// class AutomaticAppletTest --- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2013-09-06 11:29:24.000000000 -0700 -+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2014-07-15 23:24:39.000000000 -0700 @@ -25,10 +25,11 @@ fi @@ -98702,7 +102385,7 @@ if [ -z "${TESTJAVA}" ] ; then --- ./jdk/test/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/test/java/awt/Toolkit/LoadAWTCrashTest/LoadAWTCrashTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -98742,7 +102425,7 @@ + } +} --- ./jdk/test/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/Toolkit/ToolkitPropertyTest/bug7129133.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -98795,7 +102478,7 @@ + } +} --- ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.html 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,43 @@ +<html> +<!-- @@ -98841,7 +102524,7 @@ +</body> +</html> --- ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/TrayIcon/ShowAfterDisposeTest/ShowAfterDisposeTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,246 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -99090,7 +102773,7 @@ + } +} --- ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,133 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -99226,7 +102909,7 @@ + } +} --- ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -99357,7 +103040,7 @@ + } +} --- ./jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java 2013-09-06 11:29:24.000000000 -0700 -+++ ./jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java 2014-01-18 12:16:24.000000000 -0800 ++++ ./jdk/test/java/awt/event/KeyEvent/KeyReleasedInAppletTest/KeyReleasedInAppletTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -39,13 +39,10 @@ import java.util.Hashtable; @@ -99377,7 +103060,7 @@ public class KeyReleasedInAppletTest extends JApplet { --- ./jdk/test/java/awt/font/TextLayout/TestAATMorxFont.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/font/TextLayout/TestAATMorxFont.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/test/java/awt/font/TextLayout/TestAATMorxFont.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,86 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -99466,7 +103149,7 @@ +} + --- ./jdk/test/java/awt/print/bug8023392/bug8023392.html 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/print/bug8023392/bug8023392.html 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/print/bug8023392/bug8023392.html 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,20 @@ +<html> +<!-- @@ -99489,7 +103172,7 @@ +</body> +</html> --- ./jdk/test/java/awt/print/bug8023392/bug8023392.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/awt/print/bug8023392/bug8023392.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/awt/print/bug8023392/bug8023392.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,286 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -99778,7 +103461,7 @@ +}// TestDialog class + --- ./jdk/test/java/beans/Introspector/TestTypeResolver.java 2013-09-06 11:29:26.000000000 -0700 -+++ ./jdk/test/java/beans/Introspector/TestTypeResolver.java 2014-04-19 01:27:12.000000000 -0700 ++++ ./jdk/test/java/beans/Introspector/TestTypeResolver.java 2014-07-15 23:24:38.000000000 -0700 @@ -113,6 +113,8 @@ // by private implementations of the various Type interfaces if (expect.equals(t) && t.equals(expect)) @@ -99789,7 +103472,7 @@ System.out.println(" BUT SHOULD BE " + expect); failedCases.add(c); --- ./jdk/test/java/beans/XMLDecoder/8028054/Task.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/beans/XMLDecoder/8028054/Task.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/beans/XMLDecoder/8028054/Task.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -99891,7 +103574,7 @@ + } +} --- ./jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -99975,7 +103658,7 @@ + } +} --- ./jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -100059,7 +103742,7 @@ + } +} --- ./jdk/test/java/beans/XMLEncoder/Test8027066.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/beans/XMLEncoder/Test8027066.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/beans/XMLEncoder/Test8027066.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -100103,7 +103786,7 @@ + } +} --- ./jdk/test/java/io/File/GetXSpace.sh 2013-09-06 11:29:29.000000000 -0700 -+++ ./jdk/test/java/io/File/GetXSpace.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/io/File/GetXSpace.sh 2014-07-15 23:24:38.000000000 -0700 @@ -26,7 +26,7 @@ # set platform-dependent variable OS=`uname -s` @@ -100114,7 +103797,7 @@ Windows* ) SID=`sid`; TMP="c:/temp" ;; * ) --- ./jdk/test/java/io/File/createTempFile/SpecialTempFile.java 2013-09-06 11:29:29.000000000 -0700 -+++ ./jdk/test/java/io/File/createTempFile/SpecialTempFile.java 2013-12-01 11:14:28.000000000 -0800 ++++ ./jdk/test/java/io/File/createTempFile/SpecialTempFile.java 2014-07-15 23:24:38.000000000 -0700 @@ -23,7 +23,7 @@ /* @@ -100215,7 +103898,7 @@ } } --- ./jdk/test/java/io/FileOutputStream/ManyFiles.java 2013-09-06 11:29:29.000000000 -0700 -+++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/io/FileOutputStream/ManyFiles.java 2014-07-15 23:24:38.000000000 -0700 @@ -43,7 +43,7 @@ // Windows capability it is much simpler to only run it // on that platform. @@ -100226,7 +103909,7 @@ for (int n = 0; n < NUM_FILES; n++) { --- ./jdk/test/java/io/IOException/LastErrorString.java 2013-09-06 11:29:29.000000000 -0700 -+++ ./jdk/test/java/io/IOException/LastErrorString.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/java/io/IOException/LastErrorString.java 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved. @@ -100245,7 +103928,7 @@ */ --- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2013-09-06 11:29:30.000000000 -0700 -+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2014-07-15 23:24:38.000000000 -0700 @@ -41,7 +41,7 @@ # Need to determine the classpath separator and filepath separator based on the # operating system. @@ -100256,7 +103939,7 @@ Windows* | CYGWIN* ) PS=";" ;; --- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2013-09-06 11:29:31.000000000 -0700 -+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2014-07-15 23:24:38.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -100267,7 +103950,7 @@ Windows* | CYGWIN* ) PS=";" ;; --- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2013-09-06 11:29:31.000000000 -0700 -+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2014-07-15 23:24:38.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -100278,7 +103961,7 @@ Windows* | CYGWIN* ) PS=";" ;; --- ./jdk/test/java/lang/Class/checkMemberAccess/CheckMemberAccess.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/Class/checkMemberAccess/CheckMemberAccess.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/Class/checkMemberAccess/CheckMemberAccess.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -100404,7 +104087,7 @@ + static class Foo {} +} --- ./jdk/test/java/lang/Class/checkMemberAccess/test.policy 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/Class/checkMemberAccess/test.policy 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/Class/checkMemberAccess/test.policy 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,6 @@ +grant { + permission java.lang.RuntimePermission "createSecurityManager"; @@ -100413,7 +104096,7 @@ + permission java.util.PropertyPermission "*", "read"; +}; --- ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh 2013-09-06 11:29:32.000000000 -0700 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestCrossDelegate.sh 2014-07-15 23:24:38.000000000 -0700 @@ -45,13 +45,7 @@ # set platform-specific variables OS=`uname -s` @@ -100430,7 +104113,7 @@ ;; Windows*) --- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2013-09-06 11:29:32.000000000 -0700 -+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2014-07-15 23:24:38.000000000 -0700 @@ -49,13 +49,7 @@ # set platform-specific variables OS=`uname -s` @@ -100447,7 +104130,7 @@ ;; Windows* | CYGWIN* ) --- ./jdk/test/java/lang/ProcessBuilder/Basic.java 2013-09-06 11:29:33.000000000 -0700 -+++ ./jdk/test/java/lang/ProcessBuilder/Basic.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/Basic.java 2014-07-15 23:24:39.000000000 -0700 @@ -29,6 +29,7 @@ * 4947220 7018606 7034570 * @summary Basic tests for Process and Environment Variable code @@ -100513,7 +104196,7 @@ equal(r.exitValue(), 1); } catch (Throwable t) { unexpected(t); } --- ./jdk/test/java/lang/ProcessBuilder/BasicLauncher.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/ProcessBuilder/BasicLauncher.java 2014-04-19 01:27:13.000000000 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/BasicLauncher.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -100615,7 +104298,7 @@ + } +} --- ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -100665,7 +104348,7 @@ + } +} --- ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/InheritIO/InheritIO.sh 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,81 @@ +# +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -100749,7 +104432,7 @@ + +echo 'PASS: InheritIO works as expected' --- ./jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/InheritIOEHandle.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -100899,7 +104582,7 @@ + } +} --- ./jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/ProcessBuilder/SiblingIOEHandle.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,205 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -101107,7 +104790,7 @@ + } +} --- ./jdk/test/java/lang/Runtime/exec/CloseRace.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/Runtime/exec/CloseRace.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/Runtime/exec/CloseRace.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -101256,7 +104939,7 @@ + } +} --- ./jdk/test/java/lang/SecurityManager/CheckPackageAccess.java 2013-09-06 11:29:33.000000000 -0700 -+++ ./jdk/test/java/lang/SecurityManager/CheckPackageAccess.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/SecurityManager/CheckPackageAccess.java 2014-07-15 23:24:39.000000000 -0700 @@ -23,7 +23,7 @@ /* @@ -101285,7 +104968,7 @@ "org.jcp.xml.dsig.internal.", }; --- ./jdk/test/java/lang/String/ToLowerCase.java 2013-09-06 11:29:33.000000000 -0700 -+++ ./jdk/test/java/lang/String/ToLowerCase.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/String/ToLowerCase.java 2014-07-15 23:24:39.000000000 -0700 @@ -23,7 +23,7 @@ /* @@ -101310,7 +104993,7 @@ // Remove dot_above in the sequence I + dot_above (Turkish and Azeri) test("I\u0307", turkish, "i"); --- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2013-09-06 11:29:33.000000000 -0700 -+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2014-07-15 23:24:39.000000000 -0700 @@ -30,7 +30,7 @@ # set platform-dependent variables OS=`uname -s` @@ -101321,7 +105004,7 @@ echo "Passed"; exit 0 ;; * ) echo "Unrecognized system!" ; exit 1 ;; --- ./jdk/test/java/lang/System/MacEncoding/ExpectedEncoding.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/System/MacEncoding/ExpectedEncoding.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/System/MacEncoding/ExpectedEncoding.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -101390,7 +105073,7 @@ + } +} --- ./jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.sh 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.sh 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/System/MacEncoding/MacJNUEncoding.sh 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,96 @@ +#!/bin/sh + @@ -101489,7 +105172,7 @@ +exit 0 + --- ./jdk/test/java/lang/System/MacEncoding/TestFileEncoding.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/System/MacEncoding/TestFileEncoding.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/java/lang/System/MacEncoding/TestFileEncoding.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,168 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -101818,7 +105501,7 @@ -exit 0 - --- ./jdk/test/java/lang/ThreadGroup/Suspend.java 2013-09-06 11:29:34.000000000 -0700 -+++ ./jdk/test/java/lang/ThreadGroup/Suspend.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/ThreadGroup/Suspend.java 2014-07-15 23:24:39.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved. @@ -101907,7 +105590,7 @@ } } --- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2013-09-06 11:29:34.000000000 -0700 -+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2014-07-15 23:24:39.000000000 -0700 @@ -44,7 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -101918,7 +105601,7 @@ PS=":" FS="/" --- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2013-09-06 11:29:34.000000000 -0700 -+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2014-07-15 23:24:39.000000000 -0700 @@ -49,7 +49,7 @@ OS=`uname -s` @@ -101929,7 +105612,7 @@ ;; --- ./jdk/test/java/lang/instrument/RedefineBigClass.sh 2013-09-06 11:29:34.000000000 -0700 -+++ ./jdk/test/java/lang/instrument/RedefineBigClass.sh 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/instrument/RedefineBigClass.sh 2014-07-15 23:24:39.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -101947,7 +105630,7 @@ # @author Daniel D. Daugherty # --- ./jdk/test/java/lang/instrument/RedefineBigClassApp.java 2013-09-06 11:29:34.000000000 -0700 -+++ ./jdk/test/java/lang/instrument/RedefineBigClassApp.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/instrument/RedefineBigClassApp.java 2014-07-15 23:24:39.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -102018,7 +105701,7 @@ + } } --- ./jdk/test/java/lang/instrument/RetransformBigClass.sh 2013-09-06 11:29:34.000000000 -0700 -+++ ./jdk/test/java/lang/instrument/RetransformBigClass.sh 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/instrument/RetransformBigClass.sh 2014-07-15 23:24:39.000000000 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -102036,7 +105719,7 @@ # @summary Retransform a big class. # @author Daniel D. Daugherty --- ./jdk/test/java/lang/instrument/RetransformBigClassApp.java 2013-09-06 11:29:34.000000000 -0700 -+++ ./jdk/test/java/lang/instrument/RetransformBigClassApp.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/instrument/RetransformBigClassApp.java 2014-07-15 23:24:39.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -102107,7 +105790,7 @@ + } } --- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2013-09-06 11:29:35.000000000 -0700 -+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2014-07-15 23:24:39.000000000 -0700 @@ -35,15 +35,7 @@ OS=`uname -s` @@ -102126,7 +105809,7 @@ FS="/" ;; --- ./jdk/test/java/lang/invoke/8009222/Test8009222.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/invoke/8009222/Test8009222.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/invoke/8009222/Test8009222.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -102178,7 +105861,7 @@ + } +} --- ./jdk/test/java/lang/invoke/BigArityTest.java 2013-09-06 11:29:35.000000000 -0700 -+++ ./jdk/test/java/lang/invoke/BigArityTest.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/invoke/BigArityTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -26,7 +26,7 @@ /* @test * @summary High arity invocations, up to the maximum of 255 arguments @@ -102189,7 +105872,7 @@ package test.java.lang.invoke; --- ./jdk/test/java/lang/invoke/CallSiteTest.java 2013-09-06 11:29:35.000000000 -0700 -+++ ./jdk/test/java/lang/invoke/CallSiteTest.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/invoke/CallSiteTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -28,7 +28,7 @@ * * @build indify.Indify @@ -102199,8 +105882,138 @@ * indify.Indify * --expand-properties --classpath ${test.classes} * --java test.java.lang.invoke.CallSiteTest +--- ./jdk/test/java/lang/invoke/JavaDocExamplesTest.java 2013-09-06 11:29:35.000000000 -0700 ++++ ./jdk/test/java/lang/invoke/JavaDocExamplesTest.java 2014-07-15 23:24:39.000000000 -0700 +@@ -64,7 +64,11 @@ + new JavaDocExamplesTest().run(); + } + public void run() throws Throwable { ++ testMisc(); ++ testFindStatic(); ++ testFindConstructor(); + testFindVirtual(); ++ testFindSpecial(); + testPermuteArguments(); + testDropArguments(); + testFilterArguments(); +@@ -110,7 +114,8 @@ + + {} + +- @Test public void testFindVirtual() throws Throwable { ++ @Test public void testMisc() throws Throwable { ++// Extra tests, not from javadoc: + {} + MethodHandle CONCAT_3 = LOOKUP.findVirtual(String.class, + "concat", methodType(String.class, String.class)); +@@ -125,6 +130,92 @@ + {} + } + ++ @Test public void testFindStatic() throws Throwable { ++{} ++MethodHandle MH_asList = publicLookup().findStatic(Arrays.class, ++ "asList", methodType(List.class, Object[].class)); ++assertEquals("[x, y]", MH_asList.invoke("x", "y").toString()); ++{} ++ } ++ ++ @Test public void testFindVirtual() throws Throwable { ++{} ++MethodHandle MH_concat = publicLookup().findVirtual(String.class, ++ "concat", methodType(String.class, String.class)); ++MethodHandle MH_hashCode = publicLookup().findVirtual(Object.class, ++ "hashCode", methodType(int.class)); ++MethodHandle MH_hashCode_String = publicLookup().findVirtual(String.class, ++ "hashCode", methodType(int.class)); ++assertEquals("xy", (String) MH_concat.invokeExact("x", "y")); ++assertEquals("xy".hashCode(), (int) MH_hashCode.invokeExact((Object)"xy")); ++assertEquals("xy".hashCode(), (int) MH_hashCode_String.invokeExact("xy")); ++// interface method: ++MethodHandle MH_subSequence = publicLookup().findVirtual(CharSequence.class, ++ "subSequence", methodType(CharSequence.class, int.class, int.class)); ++assertEquals("def", MH_subSequence.invoke("abcdefghi", 3, 6).toString()); ++// constructor "internal method" must be accessed differently: ++MethodType MT_newString = methodType(void.class); //()V for new String() ++try { assertEquals("impossible", lookup() ++ .findVirtual(String.class, "<init>", MT_newString)); ++ } catch (NoSuchMethodException ex) { } // OK ++MethodHandle MH_newString = publicLookup() ++ .findConstructor(String.class, MT_newString); ++assertEquals("", (String) MH_newString.invokeExact()); ++{} ++ } ++ ++ @Test public void testFindConstructor() throws Throwable { ++{} ++MethodHandle MH_newArrayList = publicLookup().findConstructor( ++ ArrayList.class, methodType(void.class, Collection.class)); ++Collection orig = Arrays.asList("x", "y"); ++Collection copy = (ArrayList) MH_newArrayList.invokeExact(orig); ++assert(orig != copy); ++assertEquals(orig, copy); ++// a variable-arity constructor: ++MethodHandle MH_newProcessBuilder = publicLookup().findConstructor( ++ ProcessBuilder.class, methodType(void.class, String[].class)); ++ProcessBuilder pb = (ProcessBuilder) ++ MH_newProcessBuilder.invoke("x", "y", "z"); ++assertEquals("[x, y, z]", pb.command().toString()); ++{} ++ } ++ ++// for testFindSpecial ++{} ++static class Listie extends ArrayList { ++ public String toString() { return "[wee Listie]"; } ++ static Lookup lookup() { return MethodHandles.lookup(); } ++} ++{} ++ ++ @Test public void testFindSpecial() throws Throwable { ++{} ++// no access to constructor via invokeSpecial: ++MethodHandle MH_newListie = Listie.lookup() ++ .findConstructor(Listie.class, methodType(void.class)); ++Listie l = (Listie) MH_newListie.invokeExact(); ++try { assertEquals("impossible", Listie.lookup().findSpecial( ++ Listie.class, "<init>", methodType(void.class), Listie.class)); ++ } catch (NoSuchMethodException ex) { } // OK ++// access to super and self methods via invokeSpecial: ++MethodHandle MH_super = Listie.lookup().findSpecial( ++ ArrayList.class, "toString" , methodType(String.class), Listie.class); ++MethodHandle MH_this = Listie.lookup().findSpecial( ++ Listie.class, "toString" , methodType(String.class), Listie.class); ++MethodHandle MH_duper = Listie.lookup().findSpecial( ++ Object.class, "toString" , methodType(String.class), Listie.class); ++assertEquals("[]", (String) MH_super.invokeExact(l)); ++assertEquals(""+l, (String) MH_this.invokeExact(l)); ++assertEquals("[]", (String) MH_duper.invokeExact(l)); // ArrayList method ++try { assertEquals("inaccessible", Listie.lookup().findSpecial( ++ String.class, "toString", methodType(String.class), Listie.class)); ++ } catch (IllegalAccessException ex) { } // OK ++Listie subl = new Listie() { public String toString() { return "[subclass]"; } }; ++assertEquals(""+l, (String) MH_this.invokeExact(subl)); // Listie method ++{} ++ } ++ + @Test public void testPermuteArguments() throws Throwable { + {{ + {} /// JAVADOC +@@ -275,6 +366,12 @@ + MethodHandle eq2 = equals.asSpreader(Object[].class, 2); + assert( (boolean) eq2.invokeExact(new Object[]{ "me", "me" })); + assert(!(boolean) eq2.invokeExact(new Object[]{ "me", "thee" })); ++// try to spread from anything but a 2-array: ++for (int n = 0; n <= 10; n++) { ++ Object[] badArityArgs = (n == 2 ? null : new Object[n]); ++ try { assert((boolean) eq2.invokeExact(badArityArgs) && false); } ++ catch (IllegalArgumentException ex) { } // OK ++} + // spread both arguments from a String array: + MethodHandle eq2s = equals.asSpreader(String[].class, 2); + assert( (boolean) eq2s.invokeExact(new String[]{ "me", "me" })); --- ./jdk/test/java/lang/invoke/MethodHandleConstants.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/invoke/MethodHandleConstants.java 2013-12-01 11:14:29.000000000 -0800 ++++ ./jdk/test/java/lang/invoke/MethodHandleConstants.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,188 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. @@ -102391,7 +106204,7 @@ + } +} --- ./jdk/test/java/lang/invoke/MethodHandlesTest.java 2013-09-06 11:29:35.000000000 -0700 -+++ ./jdk/test/java/lang/invoke/MethodHandlesTest.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/invoke/MethodHandlesTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -26,7 +26,7 @@ /* @test * @summary unit tests for java.lang.invoke.MethodHandles @@ -102401,8 +106214,423 @@ */ package test.java.lang.invoke; +@@ -363,6 +363,7 @@ + protected Example(String name) { this.name = name; } + @SuppressWarnings("LeakingThisInConstructor") + protected Example(int x) { this(); called("protected <init>", this, x); } ++ //Example(Void x) { does not exist; lookup elicts NoSuchMethodException } + @Override public String toString() { return name; } + + public void v0() { called("v0", this); } +@@ -463,6 +464,9 @@ + return lookup.in(defc); + } + ++ /** Is findVirtual (etc.) of "<init>" supposed to elicit a NoSuchMethodException? */ ++ final static boolean INIT_REF_CAUSES_NSME = true; ++ + @Test + public void testFindStatic() throws Throwable { + if (CAN_SKIP_WORKING) return; +@@ -483,6 +487,8 @@ + testFindStatic(Example.class, Object.class, "s7", float.class, double.class); + + testFindStatic(false, PRIVATE, Example.class, void.class, "bogus"); ++ testFindStatic(false, PRIVATE, Example.class, void.class, "<init>", int.class); ++ testFindStatic(false, PRIVATE, Example.class, void.class, "<init>", Void.class); + testFindStatic(false, PRIVATE, Example.class, void.class, "v0"); + } + +@@ -505,11 +511,12 @@ + target = maybeMoveIn(lookup, defc).findStatic(defc, methodName, type); + } catch (ReflectiveOperationException ex) { + noAccess = ex; ++ assertExceptionClass( ++ (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>")) ++ ? NoSuchMethodException.class ++ : IllegalAccessException.class, ++ noAccess); + if (verbosity >= 5) ex.printStackTrace(System.out); +- if (name.contains("bogus")) +- assertTrue(noAccess instanceof NoSuchMethodException); +- else +- assertTrue(noAccess instanceof IllegalAccessException); + } + if (verbosity >= 3) + System.out.println("findStatic "+lookup+": "+defc.getName()+"."+name+"/"+type+" => "+target +@@ -527,6 +534,13 @@ + System.out.print(':'); + } + ++ static void assertExceptionClass(Class<? extends Throwable> expected, ++ Throwable actual) { ++ if (expected.isInstance(actual)) return; ++ actual.printStackTrace(); ++ assertEquals(expected, actual.getClass()); ++ } ++ + static final boolean DEBUG_METHOD_HANDLE_NAMES = Boolean.getBoolean("java.lang.invoke.MethodHandle.DEBUG_NAMES"); + + // rough check of name string +@@ -556,6 +570,8 @@ + testFindVirtual(PubExample.class, void.class, "Pub/pro_v0"); + + testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "bogus"); ++ testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "<init>", int.class); ++ testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "<init>", Void.class); + testFindVirtual(false, PRIVATE, Example.class, Example.class, void.class, "s0"); + + // test dispatch +@@ -591,11 +607,12 @@ + target = maybeMoveIn(lookup, defc).findVirtual(defc, methodName, type); + } catch (ReflectiveOperationException ex) { + noAccess = ex; ++ assertExceptionClass( ++ (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>")) ++ ? NoSuchMethodException.class ++ : IllegalAccessException.class, ++ noAccess); + if (verbosity >= 5) ex.printStackTrace(System.out); +- if (name.contains("bogus")) +- assertTrue(noAccess instanceof NoSuchMethodException); +- else +- assertTrue(noAccess instanceof IllegalAccessException); + } + if (verbosity >= 3) + System.out.println("findVirtual "+lookup+": "+defc.getName()+"."+name+"/"+type+" => "+target +@@ -632,11 +649,11 @@ + testFindSpecial(SubExample.class, Example.class, void.class, "pkg_v0"); + testFindSpecial(RemoteExample.class, PubExample.class, void.class, "Pub/pro_v0"); + // Do some negative testing: +- testFindSpecial(false, EXAMPLE, SubExample.class, Example.class, void.class, "bogus"); +- testFindSpecial(false, PRIVATE, SubExample.class, Example.class, void.class, "bogus"); + for (Lookup lookup : new Lookup[]{ PRIVATE, EXAMPLE, PACKAGE, PUBLIC }) { + testFindSpecial(false, lookup, Object.class, Example.class, void.class, "v0"); ++ testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "bogus"); + testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "<init>", int.class); ++ testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "<init>", Void.class); + testFindSpecial(false, lookup, SubExample.class, Example.class, void.class, "s0"); + } + } +@@ -662,19 +679,25 @@ + countTest(positive); + String methodName = name.substring(1 + name.indexOf('/')); // foo/bar => foo + MethodType type = MethodType.methodType(ret, params); ++ Lookup specialLookup = maybeMoveIn(lookup, specialCaller); ++ boolean specialAccessOK = (specialLookup.lookupClass() == specialCaller && ++ (specialLookup.lookupModes() & Lookup.PRIVATE) != 0); + MethodHandle target = null; + Exception noAccess = null; + try { + if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type); +- if (verbosity >= 5) System.out.println(" lookup => "+maybeMoveIn(lookup, specialCaller)); +- target = maybeMoveIn(lookup, specialCaller).findSpecial(defc, methodName, type, specialCaller); ++ if (verbosity >= 5) System.out.println(" lookup => "+specialLookup); ++ target = specialLookup.findSpecial(defc, methodName, type, specialCaller); + } catch (ReflectiveOperationException ex) { + noAccess = ex; ++ assertExceptionClass( ++ (!specialAccessOK) // this check should happen first ++ ? IllegalAccessException.class ++ : (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>")) ++ ? NoSuchMethodException.class ++ : IllegalAccessException.class, ++ noAccess); + if (verbosity >= 5) ex.printStackTrace(System.out); +- if (name.contains("bogus")) +- assertTrue(noAccess instanceof NoSuchMethodException); +- else +- assertTrue(noAccess instanceof IllegalAccessException); + } + if (verbosity >= 3) + System.out.println("findSpecial from "+specialCaller.getName()+" to "+defc.getName()+"."+name+"/"+type+" => "+target +@@ -719,7 +742,7 @@ + target = lookup.findConstructor(defc, type); + } catch (ReflectiveOperationException ex) { + noAccess = ex; +- assertTrue(noAccess instanceof IllegalAccessException); ++ assertTrue(noAccess.getClass().getName(), noAccess instanceof IllegalAccessException); + } + if (verbosity >= 3) + System.out.println("findConstructor "+defc.getName()+".<init>/"+type+" => "+target +@@ -750,6 +773,8 @@ + testBind(Example.class, Object.class, "v2", int.class, Object.class); + testBind(Example.class, Object.class, "v2", int.class, int.class); + testBind(false, PRIVATE, Example.class, void.class, "bogus"); ++ testBind(false, PRIVATE, Example.class, void.class, "<init>", int.class); ++ testBind(false, PRIVATE, Example.class, void.class, "<init>", Void.class); + testBind(SubExample.class, void.class, "Sub/v0"); + testBind(SubExample.class, void.class, "Sub/pkg_v0"); + testBind(IntExample.Impl.class, void.class, "Int/v0"); +@@ -773,11 +798,12 @@ + target = maybeMoveIn(lookup, defc).bind(receiver, methodName, type); + } catch (ReflectiveOperationException ex) { + noAccess = ex; ++ assertExceptionClass( ++ (name.contains("bogus") || INIT_REF_CAUSES_NSME && name.contains("<init>")) ++ ? NoSuchMethodException.class ++ : IllegalAccessException.class, ++ noAccess); + if (verbosity >= 5) ex.printStackTrace(System.out); +- if (name.contains("bogus")) +- assertTrue(noAccess instanceof NoSuchMethodException); +- else +- assertTrue(noAccess instanceof IllegalAccessException); + } + if (verbosity >= 3) + System.out.println("bind "+receiver+"."+name+"/"+type+" => "+target +@@ -840,6 +866,10 @@ + countTest(positive); + String methodName = name.substring(1 + name.indexOf('/')); // foo/bar => foo + MethodType type = MethodType.methodType(ret, params); ++ Lookup specialLookup = (specialCaller != null ? maybeMoveIn(lookup, specialCaller) : null); ++ boolean specialAccessOK = (specialCaller != null && ++ specialLookup.lookupClass() == specialCaller && ++ (specialLookup.lookupModes() & Lookup.PRIVATE) != 0); + Method rmethod = defc.getDeclaredMethod(methodName, params); + MethodHandle target = null; + Exception noAccess = null; +@@ -848,16 +878,15 @@ + try { + if (verbosity >= 4) System.out.println("lookup via "+lookup+" of "+defc+" "+name+type); + if (isSpecial) +- target = maybeMoveIn(lookup, specialCaller).unreflectSpecial(rmethod, specialCaller); ++ target = specialLookup.unreflectSpecial(rmethod, specialCaller); + else + target = maybeMoveIn(lookup, defc).unreflect(rmethod); + } catch (ReflectiveOperationException ex) { + noAccess = ex; ++ assertExceptionClass( ++ IllegalAccessException.class, // NSME is impossible, since it was already reflected ++ noAccess); + if (verbosity >= 5) ex.printStackTrace(System.out); +- if (name.contains("bogus")) +- assertTrue(noAccess instanceof NoSuchMethodException); +- else +- assertTrue(noAccess instanceof IllegalAccessException); + } + if (verbosity >= 3) + System.out.println("unreflect"+(isSpecial?"Special":"")+" "+defc.getName()+"."+name+"/"+type +@@ -1091,11 +1120,12 @@ + } catch (ReflectiveOperationException ex) { + mh = null; + noAccess = ex; ++ assertExceptionClass( ++ (fname.contains("bogus")) ++ ? NoSuchFieldException.class ++ : IllegalAccessException.class, ++ noAccess); + if (verbosity >= 5) ex.printStackTrace(System.out); +- if (fname.contains("bogus")) +- assertTrue(noAccess instanceof NoSuchFieldException); +- else +- assertTrue(noAccess instanceof IllegalAccessException); + } + if (verbosity >= 3) + System.out.println("find"+(isStatic?"Static":"")+(isGetter?"Getter":"Setter")+" "+fclass.getName()+"."+fname+"/"+ftype +--- ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java 2014-07-15 23:24:39.000000000 -0700 +@@ -0,0 +1,33 @@ ++/* ++ * Copyright (c) 2014, 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 if you need additional information or have any ++ * questions. ++ * ++ */ ++ ++/** ++ * @test ++ * @bug 8032585 8033278 ++ * @summary JSR292: IllegalAccessError when attempting to invoke protected method from different package ++ * ++ * @compile p1/T2.java p2/T3.java ++ * @run main/othervm p2.T3 ++ */ ++public class Test {} +--- ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java 2014-07-15 23:24:39.000000000 -0700 +@@ -0,0 +1,127 @@ ++/* ++ * Copyright (c) 2014, 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 if you need additional information or have any ++ * questions. ++ * ++ */ ++package p1; ++ ++import p2.T3; ++ ++import java.lang.invoke.MethodHandle; ++import java.lang.invoke.MethodHandles; ++import java.lang.invoke.MethodHandles.Lookup; ++import java.lang.invoke.MethodType; ++import java.util.concurrent.Callable; ++ ++class T1 { ++ protected void m1() {} ++ protected static void m2() {} ++} ++ ++public class T2 extends T1 { ++ public static void main(String[] args) throws Throwable { ++ final Lookup LOOKUP = T3.lookup(); ++ Class<IllegalAccessException> IAE = IllegalAccessException.class; ++ ++ assertFailure(IAE, new Callable<Integer>() { ++ public Integer call() throws Exception { ++ LOOKUP.findVirtual(T1.class, "m1", MethodType.methodType(void.class)); ++ return null; ++ } ++ } ++ ); ++ assertFailure(IAE, new Callable<Integer>() { ++ public Integer call() throws Exception { ++ LOOKUP.findStatic(T1.class, "m2", MethodType.methodType(void.class)); ++ return null; ++ } ++ } ++ ); ++ ++ assertSuccess(new Callable<Integer>() { ++ public Integer call() throws Exception { ++ LOOKUP.findVirtual(T2.class, "m1", MethodType.methodType(void.class)); ++ return null; ++ } ++ } ++ ); ++ assertSuccess(new Callable<Integer>() { ++ public Integer call() throws Exception { ++ LOOKUP.findVirtual(T3.class, "m1", MethodType.methodType(void.class)); ++ return null; ++ } ++ } ++ ); ++ ++ assertSuccess(new Callable<Integer>() { ++ public Integer call() throws Exception { ++ LOOKUP.findStatic(T2.class, "m2", MethodType.methodType(void.class)); ++ return null; ++ } ++ } ++ ); ++ assertSuccess(new Callable<Integer>() { ++ public Integer call() throws Exception { ++ LOOKUP.findStatic(T3.class, "m2", MethodType.methodType(void.class)); ++ return null; ++ } ++ } ++ ); ++ ++ assertFailure(IAE, new Callable<Integer>() { ++ public Integer call() throws Exception { ++ LOOKUP.unreflect(T1.class.getDeclaredMethod("m1")); ++ return null; ++ } ++ } ++ ); ++ assertFailure(IAE, new Callable<Integer>() { ++ public Integer call() throws Exception { ++ LOOKUP.unreflect(T1.class.getDeclaredMethod("m2")); ++ return null; ++ } ++ } ++ ); ++ ++ System.out.println("TEST PASSED"); ++ } ++ ++ public static void assertFailure(Class<? extends Throwable> expectedError, Callable r) { ++ try { ++ r.call(); ++ } catch(Throwable e) { ++ if (expectedError.isAssignableFrom(e.getClass())) { ++ return; // expected error ++ } else { ++ throw new Error("Unexpected error type: "+e.getClass()+"; expected type: "+expectedError, e); ++ } ++ } ++ throw new Error("No error"); ++ } ++ ++ public static void assertSuccess(Callable r) { ++ try { ++ r.call(); ++ } catch(Throwable e) { ++ throw new Error("Unexpected error", e); ++ } ++ } ++} +--- ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java 2014-07-15 23:24:39.000000000 -0700 +@@ -0,0 +1,32 @@ ++/* ++ * Copyright (c) 2014, 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 if you need additional information or have any ++ * questions. ++ * ++ */ ++package p2; ++ ++import p1.T2; ++ ++import java.lang.invoke.MethodHandles; ++ ++public class T3 extends T2 { ++ public static MethodHandles.Lookup lookup() { return MethodHandles.lookup(); } ++} --- ./jdk/test/java/lang/invoke/RicochetTest.java 2013-09-06 11:29:35.000000000 -0700 -+++ ./jdk/test/java/lang/invoke/RicochetTest.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/invoke/RicochetTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -25,7 +25,7 @@ /* @test @@ -102413,7 +106641,7 @@ /* * @ignore The following test creates an unreasonable number of adapters in -Xcomp mode (7049122) --- ./jdk/test/java/lang/invoke/TestCatchExceptionWithVarargs.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/invoke/TestCatchExceptionWithVarargs.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/invoke/TestCatchExceptionWithVarargs.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -102513,7 +106741,7 @@ + } +} --- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2013-09-06 11:29:35.000000000 -0700 -+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2014-07-15 23:24:39.000000000 -0700 @@ -61,7 +61,7 @@ while true; do echo "Run $i: TestSystemLoadAvg" @@ -102524,7 +106752,7 @@ ;; * ) --- ./jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java 2013-09-06 11:29:35.000000000 -0700 -+++ ./jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/management/PlatformLoggingMXBean/LoggingMXBeanTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -23,7 +23,7 @@ /* @@ -102624,7 +106852,7 @@ .equals(mxbean2.getParentLoggerName(logger))) throw new RuntimeException( --- ./jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java 2013-09-06 11:29:35.000000000 -0700 -+++ ./jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/management/PlatformLoggingMXBean/PlatformLoggingMXBeanTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -23,7 +23,7 @@ /* @@ -102671,7 +106899,7 @@ // Set the level of logger1 to ALL params = new Object[2]; --- ./jdk/test/java/lang/ref/FinalizeOverride.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/lang/ref/FinalizeOverride.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/lang/ref/FinalizeOverride.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,167 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -102841,7 +107069,7 @@ + } +} --- ./jdk/test/java/net/Authenticator/B4769350.java 2013-09-06 11:29:36.000000000 -0700 -+++ ./jdk/test/java/net/Authenticator/B4769350.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/net/Authenticator/B4769350.java 2014-07-15 23:24:38.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. @@ -103519,7 +107747,7 @@ } } --- ./jdk/test/java/net/Authenticator/B4933582.sh 2013-09-06 11:29:36.000000000 -0700 -+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/net/Authenticator/B4933582.sh 2014-07-15 23:24:38.000000000 -0700 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -103530,7 +107758,7 @@ FS="/" ;; --- ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java 2013-09-06 11:29:36.000000000 -0700 -+++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/net/DatagramSocket/SendDatagramToBadAddress.java 2014-07-15 23:24:38.000000000 -0700 @@ -45,6 +45,8 @@ return (true); if (p.getProperty ("os.name").equals ("Linux")) @@ -103541,7 +107769,7 @@ return (true); // Check for specific Solaris version from here --- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2013-09-06 11:29:36.000000000 -0700 -+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2014-07-15 23:24:38.000000000 -0700 @@ -27,11 +27,7 @@ # set platform-dependent variables OS=`uname -s` @@ -103556,7 +107784,7 @@ FILESEP="/" ;; --- ./jdk/test/java/net/IDN/UseSTD3ASCIIRules.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/net/IDN/UseSTD3ASCIIRules.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/net/IDN/UseSTD3ASCIIRules.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -103639,7 +107867,7 @@ + } +} --- ./jdk/test/java/net/Inet6Address/serialize/Serialize.java 2013-09-06 11:29:37.000000000 -0700 -+++ ./jdk/test/java/net/Inet6Address/serialize/Serialize.java 2013-12-01 11:14:30.000000000 -0800 ++++ ./jdk/test/java/net/Inet6Address/serialize/Serialize.java 2014-07-15 23:24:38.000000000 -0700 @@ -94,7 +94,26 @@ } finally { ois.close(); @@ -103833,7 +108061,7 @@ + }; +} --- ./jdk/test/java/net/PlainSocketImpl/CustomSocketImplFactory.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/net/PlainSocketImpl/CustomSocketImplFactory.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/net/PlainSocketImpl/CustomSocketImplFactory.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -103943,7 +108171,7 @@ + } +} --- ./jdk/test/java/net/ServerSocket/AnotherSelectFdsLimit.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/net/ServerSocket/AnotherSelectFdsLimit.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/net/ServerSocket/AnotherSelectFdsLimit.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -104024,7 +108252,7 @@ + } +} --- ./jdk/test/java/net/ServerSocket/SelectFdsLimit.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/net/ServerSocket/SelectFdsLimit.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/net/ServerSocket/SelectFdsLimit.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,104 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -104131,7 +108359,7 @@ + } +} --- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2013-09-06 11:29:37.000000000 -0700 -+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2014-07-15 23:24:38.000000000 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -104142,7 +108370,7 @@ FS="/" ;; --- ./jdk/test/java/net/Socket/asyncClose/Race.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/net/Socket/asyncClose/Race.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/net/Socket/asyncClose/Race.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. @@ -104222,7 +108450,7 @@ + } +} --- ./jdk/test/java/net/URL/B5086147.sh 2013-09-06 11:29:38.000000000 -0700 -+++ ./jdk/test/java/net/URL/B5086147.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/net/URL/B5086147.sh 2014-07-15 23:24:38.000000000 -0700 @@ -26,7 +26,7 @@ OS=`uname -s` @@ -104233,7 +108461,7 @@ ;; CYGWIN* ) --- ./jdk/test/java/net/URL/runconstructor.sh 2013-09-06 11:29:38.000000000 -0700 -+++ ./jdk/test/java/net/URL/runconstructor.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/net/URL/runconstructor.sh 2014-07-15 23:24:38.000000000 -0700 @@ -27,7 +27,7 @@ # OS=`uname -s` @@ -104244,7 +108472,7 @@ FS="/" ;; --- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2013-09-06 11:29:38.000000000 -0700 -+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2014-07-15 23:24:38.000000000 -0700 @@ -34,11 +34,7 @@ OS=`uname -s` @@ -104259,7 +108487,7 @@ FS="/" ;; --- ./jdk/test/java/net/URLClassLoader/closetest/CloseTest.java 2013-09-06 11:29:38.000000000 -0700 -+++ ./jdk/test/java/net/URLClassLoader/closetest/CloseTest.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/net/URLClassLoader/closetest/CloseTest.java 2014-07-15 23:24:38.000000000 -0700 @@ -25,7 +25,8 @@ * @test * @bug 4167874 @@ -104271,7 +108499,7 @@ * @run main/othervm CloseTest * @summary URL-downloaded jar files can consume all available file descriptors --- ./jdk/test/java/net/URLClassLoader/closetest/Common.java 2013-09-06 11:29:38.000000000 -0700 -+++ ./jdk/test/java/net/URLClassLoader/closetest/Common.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/net/URLClassLoader/closetest/Common.java 2014-07-15 23:24:38.000000000 -0700 @@ -23,6 +23,9 @@ import java.io.*; @@ -104330,7 +108558,7 @@ static void copyDir (File src, File dst) { --- ./jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java 2013-09-06 11:29:38.000000000 -0700 -+++ ./jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/net/URLClassLoader/closetest/GetResourceAsStream.java 2014-07-15 23:24:38.000000000 -0700 @@ -24,6 +24,8 @@ /** * @test @@ -104341,7 +108569,7 @@ * @run main/othervm GetResourceAsStream */ --- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2013-09-06 11:29:38.000000000 -0700 -+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2014-07-15 23:24:38.000000000 -0700 @@ -27,11 +27,7 @@ OS=`uname -s` @@ -104356,7 +108584,7 @@ FS="/" ;; --- ./jdk/test/java/net/URLConnection/6212146/test.sh 2013-09-06 11:29:38.000000000 -0700 -+++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2014-07-15 23:24:38.000000000 -0700 @@ -33,11 +33,7 @@ OS=`uname -s` @@ -104371,7 +108599,7 @@ FS="/" ;; --- ./jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java 2013-09-06 11:29:39.000000000 -0700 -+++ ./jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/nio/channels/AsynchronousChannelGroup/Unbounded.java 2014-07-15 23:24:39.000000000 -0700 @@ -36,44 +36,31 @@ // number of concurrent completion handlers static final int CONCURRENCY_COUNT = 256; @@ -104482,8 +108710,105 @@ + throw new RuntimeException("I/O operation failed, see log for details"); } } +--- ./jdk/test/java/nio/channels/Selector/ByteServer.java 2013-09-06 11:29:39.000000000 -0700 ++++ ./jdk/test/java/nio/channels/Selector/ByteServer.java 2014-07-15 23:24:39.000000000 -0700 +@@ -22,52 +22,54 @@ + */ + + /** +- * +- * Utility class for tests. A simple server, which waits for a connection, +- * writes out n bytes and waits. ++ * Utility class for tests. A simple "in-thread" server to accept connections ++ * and write bytes. + * @author kladko + */ + + import java.net.Socket; + import java.net.ServerSocket; ++import java.net.SocketAddress; ++import java.net.InetSocketAddress; ++import java.io.IOException; ++import java.io.Closeable; + +-public class ByteServer { ++public class ByteServer implements Closeable { + +- public static final String LOCALHOST = "localhost"; +- private int bytecount; +- private Socket socket; +- private ServerSocket serversocket; +- private Thread serverthread; +- volatile Exception savedException; +- +- public ByteServer(int bytecount) throws Exception{ +- this.bytecount = bytecount; +- serversocket = new ServerSocket(0); +- } +- +- public int port() { +- return serversocket.getLocalPort(); +- } +- +- public void start() { +- serverthread = new Thread() { +- public void run() { +- try { +- socket = serversocket.accept(); +- socket.getOutputStream().write(new byte[bytecount]); +- socket.getOutputStream().flush(); +- } catch (Exception e) { +- System.err.println("Exception in ByteServer: " + e); +- System.exit(1); +- } +- } +- }; +- serverthread.start(); +- } +- +- public void exit() throws Exception { +- serverthread.join(); +- socket.close(); +- serversocket.close(); ++ private final ServerSocket ss; ++ private Socket s; ++ ++ ByteServer() throws IOException { ++ this.ss = new ServerSocket(0); ++ } ++ ++ SocketAddress address() { ++ return new InetSocketAddress(ss.getInetAddress(), ss.getLocalPort()); ++ } ++ ++ void acceptConnection() throws IOException { ++ if (s != null) ++ throw new IllegalStateException("already connected"); ++ this.s = ss.accept(); ++ } ++ ++ void closeConnection() throws IOException { ++ Socket s = this.s; ++ if (s != null) { ++ this.s = null; ++ s.close(); ++ } ++ } ++ ++ void write(int count) throws IOException { ++ if (s == null) ++ throw new IllegalStateException("no connection"); ++ s.getOutputStream().write(new byte[count]); ++ } ++ ++ public void close() throws IOException { ++ if (s != null) ++ s.close(); ++ ss.close(); + } + } --- ./jdk/test/java/nio/channels/Selector/LotsOfChannels.java 2013-09-06 11:29:40.000000000 -0700 -+++ ./jdk/test/java/nio/channels/Selector/LotsOfChannels.java 2013-12-01 11:14:31.000000000 -0800 ++++ ./jdk/test/java/nio/channels/Selector/LotsOfChannels.java 2014-07-15 23:24:39.000000000 -0700 @@ -22,9 +22,10 @@ */ @@ -104497,8 +108822,223 @@ * @author kladko */ +--- ./jdk/test/java/nio/channels/Selector/ReadAfterConnect.java 2013-09-06 11:29:40.000000000 -0700 ++++ ./jdk/test/java/nio/channels/Selector/ReadAfterConnect.java 2014-07-15 23:24:39.000000000 -0700 +@@ -27,27 +27,25 @@ + * @author kladko + */ + +-import java.net.*; +-import java.nio.*; +-import java.nio.channels.*; ++import java.nio.channels.Selector; ++import java.nio.channels.SelectionKey; ++import java.nio.channels.SocketChannel; + + public class ReadAfterConnect { +- + public static void main(String[] argv) throws Exception { +- ByteServer server = new ByteServer(0); // server: accept connection and do nothing +- server.start(); +- InetSocketAddress isa = new InetSocketAddress( +- InetAddress.getByName(ByteServer.LOCALHOST), server.port()); +- Selector sel = Selector.open(); +- SocketChannel sc = SocketChannel.open(); +- sc.connect(isa); +- sc.configureBlocking(false); +- sc.register(sel, SelectionKey.OP_READ); +- // Previously channel would get selected here, although there is nothing to read +- if (sel.selectNow() != 0) +- throw new Exception("Select returned nonzero value"); +- sc.close(); +- server.exit(); ++ try (ByteServer server = new ByteServer(); ++ SocketChannel sc = SocketChannel.open(server.address())) { ++ ++ server.acceptConnection(); ++ ++ try (Selector sel = Selector.open()) { ++ sc.configureBlocking(false); ++ sc.register(sel, SelectionKey.OP_READ); ++ // Previously channel would get selected here, although there is nothing to read ++ if (sel.selectNow() != 0) ++ throw new Exception("Select returned nonzero value"); ++ } ++ } + } + + } +--- ./jdk/test/java/nio/channels/Selector/SelectAfterRead.java 2013-09-06 11:29:40.000000000 -0700 ++++ ./jdk/test/java/nio/channels/Selector/SelectAfterRead.java 2014-07-15 23:24:39.000000000 -0700 +@@ -28,60 +28,62 @@ + * @author kladko + */ + +-import java.net.*; +-import java.nio.*; +-import java.nio.channels.*; ++import java.nio.ByteBuffer; ++import java.nio.channels.Selector; ++import java.nio.channels.SelectionKey; ++import java.nio.channels.SocketChannel; + + public class SelectAfterRead { + +- final static int TIMEOUT = 1000; ++ private static final int TIMEOUT = 1000; + + public static void main(String[] argv) throws Exception { +- InetAddress lh = InetAddress.getByName(ByteServer.LOCALHOST); + + // server: accept connection and write one byte +- ByteServer server = new ByteServer(1); +- server.start(); +- Selector sel = Selector.open(); +- SocketChannel sc = SocketChannel.open(); +- sc.connect(new InetSocketAddress(lh, server.port())); +- sc.read(ByteBuffer.allocate(1)); +- sc.configureBlocking(false); +- sc.register(sel, SelectionKey.OP_READ); +- // previously on Windows select would select channel here, although there was +- // nothing to read +- if (sel.selectNow() != 0) +- throw new Exception("Select returned nonzero value"); +- sc.close(); +- sel.close(); +- server.exit(); ++ try (ByteServer server = new ByteServer(); ++ SocketChannel sc = SocketChannel.open(server.address())) { ++ ++ server.acceptConnection(); ++ server.write(1); ++ ++ try (Selector sel = Selector.open()) { ++ sc.read(ByteBuffer.allocate(1)); ++ sc.configureBlocking(false); ++ sc.register(sel, SelectionKey.OP_READ); ++ // previously on Windows select would select channel here, although there was ++ // nothing to read ++ if (sel.selectNow() != 0) ++ throw new Exception("Select returned nonzero value"); ++ } ++ } + + // Now we will test a two reads combination + // server: accept connection and write two bytes +- server = new ByteServer(2); +- server.start(); +- sc = SocketChannel.open(); +- sc.connect(new InetSocketAddress(lh, server.port())); +- sc.configureBlocking(false); +- sel = Selector.open(); +- sc.register(sel, SelectionKey.OP_READ); +- if (sel.select(TIMEOUT) != 1) +- throw new Exception("One selected key expected"); +- sel.selectedKeys().clear(); +- // previously on Windows a channel would get selected only once +- if (sel.selectNow() != 1) +- throw new Exception("One selected key expected"); +- // Previously on Windows two consequent reads would cause select() +- // to select a channel, although there was nothing remaining to +- // read in the channel +- if (sc.read(ByteBuffer.allocate(1)) != 1) +- throw new Exception("One byte expected"); +- if (sc.read(ByteBuffer.allocate(1)) != 1) +- throw new Exception("One byte expected"); +- if (sel.selectNow() != 0) +- throw new Exception("Select returned nonzero value"); +- sc.close(); +- sel.close(); +- server.exit(); ++ try (ByteServer server = new ByteServer(); ++ SocketChannel sc = SocketChannel.open(server.address())) { ++ ++ server.acceptConnection(); ++ server.write(2); ++ ++ try (Selector sel = Selector.open()) { ++ sc.configureBlocking(false); ++ sc.register(sel, SelectionKey.OP_READ); ++ if (sel.select(TIMEOUT) != 1) ++ throw new Exception("One selected key expected"); ++ sel.selectedKeys().clear(); ++ // previously on Windows a channel would get selected only once ++ if (sel.selectNow() != 1) ++ throw new Exception("One selected key expected"); ++ // Previously on Windows two consequent reads would cause select() ++ // to select a channel, although there was nothing remaining to ++ // read in the channel ++ if (sc.read(ByteBuffer.allocate(1)) != 1) ++ throw new Exception("One byte expected"); ++ if (sc.read(ByteBuffer.allocate(1)) != 1) ++ throw new Exception("One byte expected"); ++ if (sel.selectNow() != 0) ++ throw new Exception("Select returned nonzero value"); ++ } ++ } + } + } +--- ./jdk/test/java/nio/channels/Selector/SelectWrite.java 2013-09-06 11:29:40.000000000 -0700 ++++ ./jdk/test/java/nio/channels/Selector/SelectWrite.java 2014-07-15 23:24:39.000000000 -0700 +@@ -22,36 +22,33 @@ + */ + + /* @test +- @bug 4645302 +- @summary Socket with OP_WRITE would get selected only once +- @author kladko ++ * @bug 4645302 ++ * @summary Socket with OP_WRITE would get selected only once ++ * @author kladko + */ + +-import java.net.*; +-import java.nio.*; +-import java.nio.channels.*; +- ++import java.nio.channels.Selector; ++import java.nio.channels.SelectionKey; ++import java.nio.channels.SocketChannel; + + public class SelectWrite { + + public static void main(String[] argv) throws Exception { +- ByteServer server = new ByteServer(0); +- // server: accept connection and do nothing +- server.start(); +- InetSocketAddress isa = new InetSocketAddress( +- InetAddress.getByName(ByteServer.LOCALHOST), server.port()); +- Selector sel = Selector.open(); +- SocketChannel sc = SocketChannel.open(); +- sc.connect(isa); +- sc.configureBlocking(false); +- sc.register(sel, SelectionKey.OP_WRITE); +- sel.select(); +- sel.selectedKeys().clear(); +- if (sel.select() == 0) { +- throw new Exception("Select returned zero"); ++ try (ByteServer server = new ByteServer(); ++ SocketChannel sc = SocketChannel.open(server.address())) { ++ ++ server.acceptConnection(); ++ ++ try (Selector sel = Selector.open()) { ++ sc.configureBlocking(false); ++ sc.register(sel, SelectionKey.OP_WRITE); ++ sel.select(); ++ sel.selectedKeys().clear(); ++ if (sel.select() == 0) { ++ throw new Exception("Select returned zero"); ++ } ++ } + } +- sc.close(); +- sel.close(); + } + + } --- ./jdk/test/java/nio/channels/Selector/SelectorLimit.java 2013-09-06 11:29:40.000000000 -0700 -+++ ./jdk/test/java/nio/channels/Selector/SelectorLimit.java 2013-12-01 11:14:31.000000000 -0800 ++++ ./jdk/test/java/nio/channels/Selector/SelectorLimit.java 2014-07-15 23:24:39.000000000 -0700 @@ -22,12 +22,13 @@ */ @@ -104515,7 +109055,7 @@ import java.io.*; --- ./jdk/test/java/nio/channels/SocketChannel/ShortWrite.java 2013-09-06 11:29:40.000000000 -0700 -+++ ./jdk/test/java/nio/channels/SocketChannel/ShortWrite.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/nio/channels/SocketChannel/ShortWrite.java 2014-07-15 23:24:39.000000000 -0700 @@ -22,7 +22,7 @@ */ @@ -104662,7 +109202,7 @@ } } --- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2013-09-06 11:29:40.000000000 -0700 -+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2014-07-15 23:24:39.000000000 -0700 @@ -71,6 +71,48 @@ EXTRA_LIBS = -lc endif @@ -104713,7 +109253,7 @@ LAUNCHERLIB=$(LIBDIR)/libLauncher.so --- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2013-09-06 11:29:40.000000000 -0700 -+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2014-07-15 23:24:39.000000000 -0700 @@ -33,11 +33,14 @@ # @run shell run_tests.sh @@ -104783,7 +109323,7 @@ LIBDIR=lib/${PLATFORM}-${ARCH} LAUNCHERLIB=${LIBDIR}/libLauncher.so --- ./jdk/test/java/nio/charset/Charset/default.sh 2013-09-06 11:29:40.000000000 -0700 -+++ ./jdk/test/java/nio/charset/Charset/default.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/nio/charset/Charset/default.sh 2014-07-15 23:24:39.000000000 -0700 @@ -41,10 +41,14 @@ fi @@ -104804,7 +109344,7 @@ JAVA=$TESTJAVA/bin/java --- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2013-09-06 11:29:40.000000000 -0700 -+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2014-07-15 23:24:39.000000000 -0700 @@ -34,7 +34,7 @@ OS=`uname -s` @@ -104815,7 +109355,7 @@ Windows* ) echo "Passed"; exit 0 ;; --- ./jdk/test/java/nio/charset/spi/basic.sh 2013-09-06 11:29:40.000000000 -0700 -+++ ./jdk/test/java/nio/charset/spi/basic.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/nio/charset/spi/basic.sh 2014-07-15 23:24:39.000000000 -0700 @@ -70,10 +70,14 @@ L="$1" shift @@ -104845,7 +109385,7 @@ *) echo "Unknown platform: `uname`"; exit 1 ;; esac --- ./jdk/test/java/nio/file/FileSystem/Basic.java 2013-09-06 11:29:41.000000000 -0700 -+++ ./jdk/test/java/nio/file/FileSystem/Basic.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/nio/file/FileSystem/Basic.java 2014-07-15 23:24:39.000000000 -0700 @@ -76,6 +76,8 @@ checkSupported(fs, "posix", "unix", "owner", "acl", "user"); if (os.equals("Linux")) @@ -104856,7 +109396,7 @@ checkSupported(fs, "posix", "unix", "owner"); if (os.equals("Windows")) --- ./jdk/test/java/nio/file/Files/BytesAndLines.java 2013-09-06 11:29:41.000000000 -0700 -+++ ./jdk/test/java/nio/file/Files/BytesAndLines.java 2014-06-06 19:56:29.000000000 -0700 ++++ ./jdk/test/java/nio/file/Files/BytesAndLines.java 2014-07-15 23:24:39.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved. @@ -104920,7 +109460,7 @@ delete(tmpfile); } --- ./jdk/test/java/nio/file/Files/CopyAndMove.java 2013-09-06 11:29:41.000000000 -0700 -+++ ./jdk/test/java/nio/file/Files/CopyAndMove.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java 2014-07-15 23:24:39.000000000 -0700 @@ -634,7 +634,7 @@ // check POSIX attributes are copied @@ -104940,7 +109480,7 @@ if (isUnix) { --- ./jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java 2013-09-06 11:29:42.000000000 -0700 -+++ ./jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java 2014-01-18 12:16:28.000000000 -0800 ++++ ./jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java 2014-07-15 23:24:39.000000000 -0700 @@ -88,6 +88,17 @@ TestLibrary.RMIDVIAINHERITEDCHANNEL_ACTIVATION_PORT); rmid.addOptions(new String[]{ @@ -104960,7 +109500,7 @@ /* --- ./jdk/test/java/rmi/registry/readTest/readTest.sh 2013-09-06 11:29:43.000000000 -0700 -+++ ./jdk/test/java/rmi/registry/readTest/readTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/rmi/registry/readTest/readTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -29,8 +29,12 @@ # @run shell readTest.sh @@ -105037,7 +109577,7 @@ --- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2013-09-06 11:29:43.000000000 -0700 -+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2014-07-15 23:24:39.000000000 -0700 @@ -84,14 +84,12 @@ @@ -105058,7 +109598,7 @@ export PATH_SEP mainpid=$$ --- ./jdk/test/java/rmi/testlibrary/TestLibrary.java 2013-09-06 11:29:44.000000000 -0700 -+++ ./jdk/test/java/rmi/testlibrary/TestLibrary.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/rmi/testlibrary/TestLibrary.java 2014-07-15 23:24:39.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. @@ -105122,7 +109662,7 @@ final String prop = property; final String def = defaultVal; --- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2013-09-06 11:29:45.000000000 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2014-07-15 23:24:39.000000000 -0700 @@ -46,15 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -105141,7 +109681,7 @@ FILESEP="/" ;; --- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2013-09-06 11:29:46.000000000 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2014-07-15 23:24:39.000000000 -0700 @@ -34,15 +34,7 @@ # set platform-dependent variables OS=`uname -s` @@ -105160,7 +109700,7 @@ FILESEP="/" ;; --- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh 2013-09-06 11:29:46.000000000 -0700 -+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock2.sh 2014-07-15 23:24:39.000000000 -0700 @@ -50,19 +50,7 @@ # set platform-dependent variables OS=`uname -s` @@ -105183,7 +109723,7 @@ FILESEP="/" ;; --- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2013-09-06 11:29:46.000000000 -0700 -+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2014-07-15 23:24:39.000000000 -0700 @@ -46,15 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -105202,7 +109742,7 @@ FILESEP="/" ;; --- ./jdk/test/java/security/Security/signedfirst/Static.sh 2013-09-06 11:29:46.000000000 -0700 -+++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2014-07-15 23:24:39.000000000 -0700 @@ -46,15 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -105221,7 +109761,7 @@ FILESEP="/" ;; --- ./jdk/test/java/util/Arrays/TimSortStackSize.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/util/Arrays/TimSortStackSize.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/util/Arrays/TimSortStackSize.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,123 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -105347,7 +109887,7 @@ + +} --- ./jdk/test/java/util/Currency/PropertiesTest.sh 2013-09-06 11:29:47.000000000 -0700 -+++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -30,7 +30,7 @@ # set platform-dependent variables OS=`uname -s` @@ -105358,7 +109898,7 @@ FS="/" ;; --- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2013-09-06 11:29:48.000000000 -0700 -+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -58,7 +58,7 @@ # set platform-dependent variables OS=`uname -s` @@ -105369,7 +109909,7 @@ FS="/" ;; --- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2013-09-06 11:29:49.000000000 -0700 -+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2014-07-15 23:24:39.000000000 -0700 @@ -31,7 +31,7 @@ # set platform-dependent variables OS=`uname -s` @@ -105380,7 +109920,7 @@ FILESEP="/" ;; --- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2013-09-06 11:29:49.000000000 -0700 -+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -72,10 +72,10 @@ Windows* | CYGWIN* ) DEL=";" @@ -105395,7 +109935,7 @@ HAS_S=YES ;; --- ./jdk/test/java/util/ServiceLoader/basic.sh 2013-09-06 11:29:50.000000000 -0700 -+++ ./jdk/test/java/util/ServiceLoader/basic.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/java/util/ServiceLoader/basic.sh 2014-07-15 23:24:39.000000000 -0700 @@ -42,9 +42,7 @@ OS=`uname -s` @@ -105408,7 +109948,7 @@ * ) SEP='\;' ;; --- ./jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,71 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -105482,7 +110022,7 @@ + } +} --- ./jdk/test/java/util/logging/LevelResourceBundle.java 2013-09-06 11:29:51.000000000 -0700 -+++ ./jdk/test/java/util/logging/LevelResourceBundle.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/util/logging/LevelResourceBundle.java 2014-07-15 23:24:39.000000000 -0700 @@ -33,15 +33,19 @@ public class LevelResourceBundle { @@ -105507,7 +110047,7 @@ private static final String RBNAME = "sun.util.logging.resources.logging"; --- ./jdk/test/java/util/logging/LocalizedLevelName.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/util/logging/LocalizedLevelName.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/util/logging/LocalizedLevelName.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -105613,7 +110153,7 @@ + } +} --- ./jdk/test/java/util/logging/TestAppletLoggerContext.java 2013-09-06 11:29:51.000000000 -0700 -+++ ./jdk/test/java/util/logging/TestAppletLoggerContext.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/test/java/util/logging/TestAppletLoggerContext.java 2014-07-15 23:24:39.000000000 -0700 @@ -110,28 +110,19 @@ } @@ -105649,7 +110189,7 @@ final static JavaAWTAccessStub javaAwtAccess = new JavaAWTAccessStub(); --- ./jdk/test/java/util/logging/TestGetLoggerNPE.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/util/logging/TestGetLoggerNPE.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/util/logging/TestGetLoggerNPE.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -105743,7 +110283,7 @@ + +} --- ./jdk/test/java/util/logging/TestLogConfigurationDeadLock.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/util/logging/TestLogConfigurationDeadLock.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/util/logging/TestLogConfigurationDeadLock.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,256 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -106002,7 +110542,7 @@ + } +} --- ./jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,340 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -106345,7 +110885,7 @@ + } +} --- ./jdk/test/java/util/logging/TestLoggerBundleSync.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/util/logging/TestLoggerBundleSync.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/util/logging/TestLoggerBundleSync.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,535 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -106883,7 +111423,7 @@ + } +} --- ./jdk/test/java/util/logging/TestLoggingWithMainAppContext.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/util/logging/TestLoggingWithMainAppContext.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/test/java/util/logging/TestLoggingWithMainAppContext.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -106961,7 +111501,7 @@ + } +} --- ./jdk/test/java/util/logging/TestMainAppContext.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/util/logging/TestMainAppContext.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/test/java/util/logging/TestMainAppContext.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,85 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -107049,7 +111589,7 @@ + +} --- ./jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java 2013-09-06 11:29:51.000000000 -0700 -+++ ./jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/util/logging/bundlesearch/ResourceBundleSearchTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -59,9 +59,32 @@ private static int numFail = 0; private static List<String> msgs = new ArrayList<>(); @@ -107165,7 +111705,7 @@ msgs.add(lr.msg); return lr.foundBundle; --- ./jdk/test/java/util/logging/deadlockconf.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/java/util/logging/deadlockconf.properties 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/java/util/logging/deadlockconf.properties 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,22 @@ +# This file is used by TestLogConfigurationDeadLockWithConf +handlers= java.util.logging.ConsoleHandler @@ -107190,7 +111730,7 @@ +foo.bar8.level = INFO +foo.bar9.level = INFO --- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2013-09-06 11:29:52.000000000 -0700 -+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2014-07-15 23:24:40.000000000 -0700 @@ -51,7 +51,7 @@ # set platform-dependent variables OS=`uname -s` @@ -107201,7 +111741,7 @@ PS=":" FS="/" --- ./jdk/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java 2013-09-06 11:29:52.000000000 -0700 -+++ ./jdk/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java 2013-12-01 11:14:33.000000000 -0800 ++++ ./jdk/test/javax/imageio/plugins/jpeg/JpegWriterLeakTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -23,7 +23,7 @@ /** @@ -107212,7 +111752,7 @@ * even if destroy() or reset() methods is not invoked. * --- ./jdk/test/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java 2014-04-19 01:27:14.000000000 -0700 ++++ ./jdk/test/javax/imageio/plugins/jpeg/TruncatedImageWarningTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -107274,7 +111814,7 @@ +} Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg differ --- ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh 2013-09-06 11:29:52.000000000 -0700 -+++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/javax/imageio/stream/StreamCloserLeak/run_test.sh 2014-07-15 23:24:40.000000000 -0700 @@ -84,7 +84,7 @@ TMP="/tmp" ;; @@ -107300,7 +111840,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk VAR="A different value for Win32" DEFAULT_JDK="C:/Program Files/Java/jdk1.8.0" --- ./jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/MBeanInfo/MBeanInfoEqualsNPETest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,216 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -107519,7 +112059,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/MBeanInfo/MBeanInfoHashCodeNPETest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -107698,7 +112238,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java 2013-09-06 11:29:53.000000000 -0700 -+++ ./jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/monitor/CounterMonitorThresholdTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -23,7 +23,7 @@ /* @@ -107742,7 +112282,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk // Stop the monitor --- ./jdk/test/javax/management/monitor/NullAttributeValueTest.java 2013-09-06 11:29:53.000000000 -0700 -+++ ./jdk/test/javax/management/monitor/NullAttributeValueTest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/monitor/NullAttributeValueTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -23,11 +23,12 @@ /* @@ -107889,7 +112429,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * Print message */ --- ./jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/openmbean/OpenMBeanInfoEqualsNPETest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,196 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -108088,7 +112628,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/openmbean/OpenMBeanInfoHashCodeNPETest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,173 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -108264,7 +112804,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/management/remote/mandatory/URLTest.java 2013-09-06 11:29:54.000000000 -0700 -+++ ./jdk/test/javax/management/remote/mandatory/URLTest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/remote/mandatory/URLTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -24,8 +24,6 @@ /* * @test @@ -108275,7 +112815,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @author Eamonn McManus * @run clean URLTest --- ./jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java 2013-09-06 11:29:54.000000000 -0700 -+++ ./jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/remote/mandatory/connection/BrokenConnectionTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -23,7 +23,7 @@ /* @@ -108308,7 +112848,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk failureListener.count); thisok = false; --- ./jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java 2013-09-06 11:29:54.000000000 -0700 -+++ ./jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -23,7 +23,7 @@ /* @@ -108344,7 +112884,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk conn.getDefaultDomain(); if (connId.equals(client.getConnectionId())) { --- ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorInternalMapTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,122 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -108469,7 +113009,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/management/remote/mandatory/connection/RMIConnectorNullSubjectConnTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -108577,7 +113117,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java 2013-09-06 11:29:54.000000000 -0700 -+++ ./jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java 2013-12-01 11:14:33.000000000 -0800 ++++ ./jdk/test/javax/management/remote/mandatory/loading/MissingClassTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -23,7 +23,7 @@ /* @@ -108587,8 +113127,121 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @summary Tests behavior when client or server gets object of unknown class * @author Eamonn McManus * @run clean MissingClassTest SingleClassLoader +--- ./jdk/test/javax/management/remote/mandatory/util/CacheMapTest.java 2013-09-06 11:29:54.000000000 -0700 ++++ ./jdk/test/javax/management/remote/mandatory/util/CacheMapTest.java 1969-12-31 16:00:00.000000000 -0800 +@@ -1,110 +0,0 @@ +-/* +- * Copyright (c) 2003, 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 if you need additional information or have any +- * questions. +- */ +- +-/* +- * @test +- * @bug 7654321 +- * @summary Tests the CacheMap class. +- * @author Eamonn McManus +- * @run clean CacheMapTest +- * @run build CacheMapTest +- * @run main CacheMapTest +- */ +- +-import java.util.Iterator; +-import java.util.Map; +- +-import com.sun.jmx.remote.util.CacheMap; +- +-public class CacheMapTest { +- public static void main(String[] args) { +- try { +- boolean ok = test(5) && test(100); +- if (ok) { +- System.out.println("Test completed"); +- return; +- } else { +- System.out.println("Test failed!"); +- System.exit(1); +- } +- } catch (Exception e) { +- System.err.println("Unexpected exception: " + e); +- e.printStackTrace(); +- System.exit(1); +- } +- } +- +- private static boolean test(int cacheSize) throws Exception { +- System.out.println("CacheMap test with cache size " + cacheSize); +- CacheMap map = new CacheMap(cacheSize); +- int size = 0; +- int maxIterations = cacheSize * 10; +- while (map.size() == size && size < maxIterations) { +- Integer key = new Integer(size); +- Object x = map.put(key, "x"); +- if (x != null) { +- System.out.println("Map already had entry " + key + "!"); +- return false; +- } +- x = map.get(key); +- if (!"x".equals(x)) { +- System.out.println("Got back surprising value: " + x); +- return false; +- } +- size++; +- } +- System.out.println("Map size is " + map.size() + " after inserting " + +- size + " elements"); +- do { +- System.gc(); +- Thread.sleep(1); +- System.out.println("Map size is " + map.size() + " after GC"); +- } while (map.size() > cacheSize); +- if (map.size() < cacheSize) { +- System.out.println("Map shrank to less than cache size: " + +- map.size() + " (surprising but not wrong)"); +- } else +- System.out.println("Map shrank to cache size as expected"); +- int lowest = size - cacheSize; +- // lowest value that can still be in cache if LRU is respected +- for (Iterator it = map.entrySet().iterator(); it.hasNext(); ) { +- Map.Entry entry = (Map.Entry) it.next(); +- Integer x = (Integer) entry.getKey(); +- int xx = x.intValue(); +- if (xx < lowest || xx >= size) { +- System.out.println("Old value remained (" + x + "), " + +- "expected none earlier than " + lowest); +- return false; +- } +- Object xxx = entry.getValue(); +- if (!"x".equals(xxx)) { +- System.out.println("Got back surprising value: " + xxx); +- return false; +- } +- } +- if (map.size() > 0) +- System.out.println("Remaining elements are the most recent ones"); +- System.out.println("Test passed"); +- return true; +- } +-} --- ./jdk/test/javax/script/CommonSetup.sh 2013-09-06 11:29:55.000000000 -0700 -+++ ./jdk/test/javax/script/CommonSetup.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/javax/script/CommonSetup.sh 2014-07-15 23:24:40.000000000 -0700 @@ -36,7 +36,7 @@ OS=`uname -s` @@ -108599,7 +113252,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/javax/script/GetInterfaceTest.java 2013-09-06 11:29:55.000000000 -0700 -+++ ./jdk/test/javax/script/GetInterfaceTest.java 2014-01-18 12:16:29.000000000 -0800 ++++ ./jdk/test/javax/script/GetInterfaceTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -67,11 +67,11 @@ foo2.bar2(); } @@ -108615,7 +113268,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } } --- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2013-09-06 11:29:55.000000000 -0700 -+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2014-07-15 23:24:40.000000000 -0700 @@ -33,17 +33,7 @@ # set platform-dependent variables OS=`uname -s` @@ -108636,7 +113289,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" RM="/bin/rm -f" --- ./jdk/test/javax/swing/JComboBox/6236162/bug6236162.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/JComboBox/6236162/bug6236162.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/swing/JComboBox/6236162/bug6236162.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -108758,7 +113411,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html 2013-09-06 11:29:58.000000000 -0700 -+++ ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.html 2014-07-15 23:24:40.000000000 -0700 @@ -1,6 +1,38 @@ <html> +<!-- @@ -108799,7 +113452,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk 2.Press BACKSPACE key. 3.Push OPEN button. --- ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.java 2013-09-06 11:29:58.000000000 -0700 -+++ ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/swing/JFileChooser/4150029/bug4150029.java 2014-07-15 23:24:40.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. @@ -108839,7 +113492,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk if (tmpDir.length() == 0) {//'java.io.tmpdir' isn't guaranteed to be defined --- ./jdk/test/javax/swing/JInternalFrame/4193219/IconCoord.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/JInternalFrame/4193219/IconCoord.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/swing/JInternalFrame/4193219/IconCoord.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,161 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -109003,7 +113656,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/swing/JInternalFrame/4251301/bug4251301.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/JInternalFrame/4251301/bug4251301.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/swing/JInternalFrame/4251301/bug4251301.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,139 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -109145,7 +113798,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java 2013-09-06 11:29:58.000000000 -0700 -+++ ./jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -27,19 +27,19 @@ @author mcherkas @run main InternalFrameIsNotCollectedTest @@ -109207,7 +113860,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk iFrame.setSize(200, 200); iFrame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); --- ./jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -109308,7 +113961,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + +} --- ./jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -109419,7 +114072,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java 2013-09-06 11:29:58.000000000 -0700 -+++ ./jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -35,11 +35,12 @@ import javax.swing.*; @@ -109435,7 +114088,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk static volatile int listenerCallCounter = 0; --- ./jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java 2014-06-06 19:56:30.000000000 -0700 ++++ ./jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,110 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -109548,7 +114201,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + public void popupMenuCanceled(PopupMenuEvent e) {} +} --- ./jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -109702,7 +114355,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/swing/JTable/7068740/bug7068740.java 2013-09-06 11:29:59.000000000 -0700 -+++ ./jdk/test/javax/swing/JTable/7068740/bug7068740.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/swing/JTable/7068740/bug7068740.java 2014-07-15 23:24:40.000000000 -0700 @@ -37,6 +37,7 @@ import java.awt.*; import java.awt.event.KeyEvent; @@ -109772,7 +114425,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk UIManager.setLookAndFeel(new MetalLookAndFeel()); setUp(); --- ./jdk/test/javax/swing/JTree/4927934/bug4927934.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/JTree/4927934/bug4927934.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/swing/JTree/4927934/bug4927934.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,247 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -110022,7 +114675,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/swing/Popup/TaskbarPositionTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/Popup/TaskbarPositionTest.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/swing/Popup/TaskbarPositionTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,340 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -110365,7 +115018,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -110457,7 +115110,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,174 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -110634,7 +115287,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/swing/text/StyledEditorKit/8016833/bug8016833.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,270 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -110907,7 +115560,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/swing/text/View/8014863/bug8014863.java 2013-09-06 11:30:00.000000000 -0700 -+++ ./jdk/test/javax/swing/text/View/8014863/bug8014863.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/swing/text/View/8014863/bug8014863.java 2014-07-15 23:24:40.000000000 -0700 @@ -24,6 +24,7 @@ /* * @test @@ -111091,7 +115744,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk frame.setSize(200, 200); frame.setVisible(true); --- ./jdk/test/javax/xml/jaxp/XPath/8009579/XPathExceptionInitCause.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/XPath/8009579/XPathExceptionInitCause.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/XPath/8009579/XPathExceptionInitCause.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,220 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -111314,7 +115967,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/xml/jaxp/XPath/8015978/XPathNegativeZero.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/XPath/8015978/XPathNegativeZero.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/XPath/8015978/XPathNegativeZero.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -111389,18 +116042,18 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/xml/jaxp/XPath/8015978/dummy.xml 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/XPath/8015978/dummy.xml 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/XPath/8015978/dummy.xml 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1 @@ +<top/> --- ./jdk/test/javax/xml/jaxp/XPath/8015978/negativezero.xsl 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/XPath/8015978/negativezero.xsl 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/XPath/8015978/negativezero.xsl 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,4 @@ +<xsl:stylesheet version='1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform'> + <xsl:output method='xml' indent='yes' omit-xml-declaration='yes'/> + <xsl:template match='/'><newtop>"<xsl:value-of select='string(-0.0)'/>"</newtop></xsl:template> +</xsl:stylesheet> --- ./jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java 2013-09-06 11:30:01.000000000 -0700 -+++ ./jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -22,7 +22,8 @@ */ @@ -111454,7 +116107,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk // Apply the xsl file to the source file and write the result to the output file xformer.transform(source, result); --- ./jdk/test/javax/xml/jaxp/parsers/8024707/TestFunc.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/parsers/8024707/TestFunc.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/parsers/8024707/TestFunc.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -111492,7 +116145,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/xml/jaxp/parsers/8024707/XSLT.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/parsers/8024707/XSLT.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/parsers/8024707/XSLT.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -111546,14 +116199,14 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/xml/jaxp/parsers/8024707/in.xml 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/parsers/8024707/in.xml 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/parsers/8024707/in.xml 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<root> +<input1><seq-elem1>inp1_1</seq-elem1></input1> +</root> --- ./jdk/test/javax/xml/jaxp/parsers/8024707/test.xsl 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/parsers/8024707/test.xsl 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/parsers/8024707/test.xsl 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:transform exclude-result-prefixes="cscdt_ufunc" version="1.0" @@ -111566,12 +116219,12 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + </xsl:template> +</xsl:transform> --- ./jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/transform/8004476/SecureProcessingTest.xml 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,2 @@ +<?xml version="1.0"?> +<helloWorld/> --- ./jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/transform/8004476/TestBase.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -111656,7 +116309,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + +} --- ./jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/transform/8004476/XPathExFuncTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,287 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -111946,7 +116599,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/transform/8004476/XSLTExFuncTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,248 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -112197,7 +116850,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xml 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<html> @@ -112207,7 +116860,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk +</a> +</html> --- ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/transform/8004476/tokenize.xsl 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" @@ -112240,7 +116893,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + +</xsl:stylesheet> --- ./jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -112303,7 +116956,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + +} --- ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="xpns.org" xmlns:xpns="xpns.org"> @@ -112318,7 +116971,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + </xsd:element> +</xsd:schema> --- ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,12 @@ +<?xml version="1.0"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="xpns1.org" xmlns:xpns="xpns1.org"> @@ -112333,7 +116986,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + </xsd:element> +</xsd:schema> --- ./jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/validation/8015092/idJ029.xsd 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xpns="xpns.org" xmlns:xpns1="xpns1.org" xmlns:xpns2="xpns2.org" xmlns:imp="importNS"> @@ -112357,7 +117010,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + <xsd:element name="tid" type="xsd:string"/> +</xsd:schema> --- ./jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/validation/8015092/idJimp.xsd 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,11 @@ +<?xml version="1.0"?> +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="importNS" xmlns:imp="importNS"> @@ -112371,7 +117024,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + </xsd:element> +</xsd:schema> --- ./jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/validation/8015243/AnyURITest.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -112434,7 +117087,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + +} --- ./jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/jaxp/validation/8015243/anyURI_b006.xsd 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,32 @@ +<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + @@ -112469,7 +117122,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + +</xsd:schema> --- ./jdk/test/javax/xml/ws/clientjar/TestService.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/ws/clientjar/TestService.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/ws/clientjar/TestService.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -112511,7 +117164,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/javax/xml/ws/clientjar/TestWsImport.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/javax/xml/ws/clientjar/TestWsImport.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/javax/xml/ws/clientjar/TestWsImport.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -112665,7 +117318,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/jprt.config 2013-09-06 11:30:01.000000000 -0700 -+++ ./jdk/test/jprt.config 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/jprt.config 2014-07-15 23:24:41.000000000 -0700 @@ -71,8 +71,8 @@ # Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise. @@ -112734,7 +117387,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk # Export PATH setting PATH="${path4sdk}" --- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2013-09-06 11:30:01.000000000 -0700 -+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2014-07-15 23:24:41.000000000 -0700 @@ -50,7 +50,7 @@ # set platform-dependent variables OS=`uname -s` @@ -112744,8 +117397,785 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk NULL=/dev/null PS=":" FS="/" +--- ./jdk/test/lib/testlibrary/AssertsTest.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/AssertsTest.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,237 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++import static jdk.testlibrary.Asserts.*; ++ ++/* @test ++ * @summary Tests the different assertions in the Assert class ++ * @library /testlibrary ++ */ ++public class AssertsTest { ++ private static class Foo implements Comparable<Foo> { ++ final int id; ++ public Foo(int id) { ++ this.id = id; ++ } ++ ++ public int compareTo(Foo f) { ++ return new Integer(id).compareTo(new Integer(f.id)); ++ } ++ } ++ ++ public static void main(String[] args) throws Exception { ++ testLessThan(); ++ testLessThanOrEqual(); ++ testEquals(); ++ testGreaterThanOrEqual(); ++ testGreaterThan(); ++ testNotEquals(); ++ testNull(); ++ testNotNull(); ++ testTrue(); ++ testFalse(); ++ } ++ ++ private static void testLessThan() throws Exception { ++ expectPass(Assertion.LT, 1, 2); ++ ++ expectFail(Assertion.LT, 2, 2); ++ expectFail(Assertion.LT, 2, 1); ++ expectFail(Assertion.LT, null, 2); ++ expectFail(Assertion.LT, 2, null); ++ } ++ ++ private static void testLessThanOrEqual() throws Exception { ++ expectPass(Assertion.LTE, 1, 2); ++ expectPass(Assertion.LTE, 2, 2); ++ ++ expectFail(Assertion.LTE, 3, 2); ++ expectFail(Assertion.LTE, null, 2); ++ expectFail(Assertion.LTE, 2, null); ++ } ++ ++ private static void testEquals() throws Exception { ++ expectPass(Assertion.EQ, 1, 1); ++ expectPass(Assertion.EQ, null, null); ++ ++ Foo f1 = new Foo(1); ++ expectPass(Assertion.EQ, f1, f1); ++ ++ Foo f2 = new Foo(1); ++ expectFail(Assertion.EQ, f1, f2); ++ expectFail(Assertion.LTE, null, 2); ++ expectFail(Assertion.LTE, 2, null); ++ } ++ ++ private static void testGreaterThanOrEqual() throws Exception { ++ expectPass(Assertion.GTE, 1, 1); ++ expectPass(Assertion.GTE, 2, 1); ++ ++ expectFail(Assertion.GTE, 1, 2); ++ expectFail(Assertion.GTE, null, 2); ++ expectFail(Assertion.GTE, 2, null); ++ } ++ ++ private static void testGreaterThan() throws Exception { ++ expectPass(Assertion.GT, 2, 1); ++ ++ expectFail(Assertion.GT, 1, 1); ++ expectFail(Assertion.GT, 1, 2); ++ expectFail(Assertion.GT, null, 2); ++ expectFail(Assertion.GT, 2, null); ++ } ++ ++ private static void testNotEquals() throws Exception { ++ expectPass(Assertion.NE, null, 1); ++ expectPass(Assertion.NE, 1, null); ++ ++ Foo f1 = new Foo(1); ++ Foo f2 = new Foo(1); ++ expectPass(Assertion.NE, f1, f2); ++ ++ expectFail(Assertion.NE, null, null); ++ expectFail(Assertion.NE, f1, f1); ++ expectFail(Assertion.NE, 1, 1); ++ } ++ ++ private static void testNull() throws Exception { ++ expectPass(Assertion.NULL, null); ++ ++ expectFail(Assertion.NULL, 1); ++ } ++ ++ private static void testNotNull() throws Exception { ++ expectPass(Assertion.NOTNULL, 1); ++ ++ expectFail(Assertion.NOTNULL, null); ++ } ++ ++ private static void testTrue() throws Exception { ++ expectPass(Assertion.TRUE, true); ++ ++ expectFail(Assertion.TRUE, false); ++ } ++ ++ private static void testFalse() throws Exception { ++ expectPass(Assertion.FALSE, false); ++ ++ expectFail(Assertion.FALSE, true); ++ } ++ ++ private static <T extends Comparable<T>> void expectPass(Assertion assertion, T ... args) ++ throws Exception { ++ Assertion.run(assertion, args); ++ } ++ ++ private static <T extends Comparable<T>> void expectFail(Assertion assertion, T ... args) ++ throws Exception { ++ try { ++ Assertion.run(assertion, args); ++ } catch (RuntimeException e) { ++ return; ++ } ++ throw new Exception("Expected " + Assertion.format(assertion, (Object[]) args) + ++ " to throw a RuntimeException"); ++ } ++ ++} ++ ++enum Assertion { ++ LT, LTE, EQ, GTE, GT, NE, NULL, NOTNULL, FALSE, TRUE; ++ ++ public static <T extends Comparable<T>> void run(Assertion assertion, T ... args) { ++ String msg = "Expected " + format(assertion, args) + " to pass"; ++ switch (assertion) { ++ case LT: ++ assertLessThan(args[0], args[1], msg); ++ break; ++ case LTE: ++ assertLessThanOrEqual(args[0], args[1], msg); ++ break; ++ case EQ: ++ assertEquals(args[0], args[1], msg); ++ break; ++ case GTE: ++ assertGreaterThanOrEqual(args[0], args[1], msg); ++ break; ++ case GT: ++ assertGreaterThan(args[0], args[1], msg); ++ break; ++ case NE: ++ assertNotEquals(args[0], args[1], msg); ++ break; ++ case NULL: ++ assertNull(args == null ? args : args[0], msg); ++ break; ++ case NOTNULL: ++ assertNotNull(args == null ? args : args[0], msg); ++ break; ++ case FALSE: ++ assertFalse((Boolean) args[0], msg); ++ break; ++ case TRUE: ++ assertTrue((Boolean) args[0], msg); ++ break; ++ default: ++ // do nothing ++ } ++ } ++ ++ public static String format(Assertion assertion, Object ... args) { ++ switch (assertion) { ++ case LT: ++ return asString("assertLessThan", args); ++ case LTE: ++ return asString("assertLessThanOrEqual", args); ++ case EQ: ++ return asString("assertEquals", args); ++ case GTE: ++ return asString("assertGreaterThanOrEquals", args); ++ case GT: ++ return asString("assertGreaterThan", args); ++ case NE: ++ return asString("assertNotEquals", args); ++ case NULL: ++ return asString("assertNull", args); ++ case NOTNULL: ++ return asString("assertNotNull", args); ++ case FALSE: ++ return asString("assertFalse", args); ++ case TRUE: ++ return asString("assertTrue", args); ++ default: ++ return ""; ++ } ++ } ++ ++ private static String asString(String assertion, Object ... args) { ++ if (args == null) { ++ return String.format("%s(null)", assertion); ++ } ++ if (args.length == 1) { ++ return String.format("%s(%s)", assertion, args[0]); ++ } else { ++ return String.format("%s(%s, %s)", assertion, args[0], args[1]); ++ } ++ } ++} +--- ./jdk/test/lib/testlibrary/ClassFileInstaller.java 2013-09-06 11:30:01.000000000 -0700 ++++ ./jdk/test/lib/testlibrary/ClassFileInstaller.java 2014-07-15 23:24:41.000000000 -0700 +@@ -45,7 +45,10 @@ + + // Create the class file's package directory + Path p = Paths.get(pathName); +- Files.createDirectories(p.getParent()); ++ Path parent = p.getParent(); ++ if (parent != null) { ++ Files.createDirectories(parent); ++ } + // Create the class file + Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING); + } +--- ./jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,122 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++ ++/* ++ * @test ++ * @summary Test the OutputAnalyzer reporting functionality, ++ * such as printing additional diagnostic info ++ * (exit code, stdout, stderr, command line, etc.) ++ * @library /testlibrary ++ */ ++ ++import java.io.ByteArrayOutputStream; ++import java.io.PrintStream; ++ ++import jdk.testlibrary.OutputAnalyzer; ++ ++public class OutputAnalyzerReportingTest { ++ ++ public static void main(String[] args) throws Exception { ++ // Create the output analyzer under test ++ String stdout = "aaaaaa"; ++ String stderr = "bbbbbb"; ++ OutputAnalyzer output = new OutputAnalyzer(stdout, stderr); ++ ++ // Expected summary values should be the same for all cases, ++ // since the outputAnalyzer object is the same ++ String expectedExitValue = "-1"; ++ String expectedSummary = ++ " stdout: [" + stdout + "];\n" + ++ " stderr: [" + stderr + "]\n" + ++ " exitValue = " + expectedExitValue + "\n"; ++ ++ ++ DiagnosticSummaryTestRunner testRunner = ++ new DiagnosticSummaryTestRunner(); ++ ++ // should have exit value ++ testRunner.init(expectedSummary); ++ int unexpectedExitValue = 2; ++ try { ++ output.shouldHaveExitValue(unexpectedExitValue); ++ } catch (RuntimeException e) { } ++ testRunner.closeAndCheckResults(); ++ ++ // should not contain ++ testRunner.init(expectedSummary); ++ try { ++ output.shouldNotContain(stdout); ++ } catch (RuntimeException e) { } ++ testRunner.closeAndCheckResults(); ++ ++ // should contain ++ testRunner.init(expectedSummary); ++ try { ++ output.shouldContain("unexpected-stuff"); ++ } catch (RuntimeException e) { } ++ testRunner.closeAndCheckResults(); ++ ++ // should not match ++ testRunner.init(expectedSummary); ++ try { ++ output.shouldNotMatch("[a]"); ++ } catch (RuntimeException e) { } ++ testRunner.closeAndCheckResults(); ++ ++ // should match ++ testRunner.init(expectedSummary); ++ try { ++ output.shouldMatch("[qwerty]"); ++ } catch (RuntimeException e) { } ++ testRunner.closeAndCheckResults(); ++ ++ } ++ ++ private static class DiagnosticSummaryTestRunner { ++ private ByteArrayOutputStream byteStream = ++ new ByteArrayOutputStream(10000); ++ ++ private String expectedSummary = ""; ++ private PrintStream errStream; ++ ++ ++ public void init(String expectedSummary) { ++ this.expectedSummary = expectedSummary; ++ byteStream.reset(); ++ errStream = new PrintStream(byteStream); ++ System.setErr(errStream); ++ } ++ ++ public void closeAndCheckResults() { ++ // check results ++ errStream.close(); ++ String stdErrStr = byteStream.toString(); ++ if (!stdErrStr.contains(expectedSummary)) { ++ throw new RuntimeException("The output does not contain " ++ + "the diagnostic message, or the message is incorrect"); ++ } ++ } ++ } ++ ++} +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Asserts.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,395 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++package jdk.testlibrary; ++ ++/** ++ * Asserts that can be used for verifying assumptions in tests. ++ * ++ * An assertion will throw a {@link RuntimeException} if the assertion isn't ++ * valid. All the asserts can be imported into a test by using a static ++ * import: ++ * ++ * <pre> ++ * {@code ++ * import static com.oracle.java.testlibrary.Asserts.*; ++ * } ++ * ++ * Always provide a message describing the assumption if the line number of the ++ * failing assertion isn't enough to understand why the assumption failed. For ++ * example, if the assertion is in a loop or in a method that is called ++ * multiple times, then the line number won't provide enough context to ++ * understand the failure. ++ * </pre> ++ */ ++public class Asserts { ++ ++ /** ++ * Shorthand for {@link #assertLessThan(T, T)}. ++ * ++ * @see #assertLessThan(T, T) ++ */ ++ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs) { ++ assertLessThan(lhs, rhs); ++ } ++ ++ /** ++ * Shorthand for {@link #assertLessThan(T, T, String)}. ++ * ++ * @see #assertLessThan(T, T, String) ++ */ ++ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs, String msg) { ++ assertLessThan(lhs, rhs, msg); ++ } ++ ++ /** ++ * Calls {@link #assertLessThan(T, T, String)} with a default message. ++ * ++ * @see #assertLessThan(T, T, String) ++ */ ++ public static <T extends Comparable<T>> void assertLessThan(T lhs, T rhs) { ++ String msg = "Expected that " + format(lhs) + " < " + format(rhs); ++ assertLessThan(lhs, rhs, msg); ++ } ++ ++ /** ++ * Asserts that {@code lhs} is less than {@code rhs}. ++ * ++ * @param lhs The left hand side of the comparison. ++ * @param rhs The right hand side of the comparison. ++ * @param msg A description of the assumption. ++ * @throws RuntimeException if the assertion isn't valid. ++ */ ++ public static <T extends Comparable<T>>void assertLessThan(T lhs, T rhs, String msg) { ++ assertTrue(compare(lhs, rhs, msg) < 0, msg); ++ } ++ ++ /** ++ * Shorthand for {@link #assertLessThanOrEqual(T, T)}. ++ * ++ * @see #assertLessThanOrEqual(T, T) ++ */ ++ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs) { ++ assertLessThanOrEqual(lhs, rhs); ++ } ++ ++ /** ++ * Shorthand for {@link #assertLessThanOrEqual(T, T, String)}. ++ * ++ * @see #assertLessThanOrEqual(T, T, String) ++ */ ++ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs, String msg) { ++ assertLessThanOrEqual(lhs, rhs, msg); ++ } ++ ++ /** ++ * Calls {@link #assertLessThanOrEqual(T, T, String)} with a default message. ++ * ++ * @see #assertLessThanOrEqual(T, T, String) ++ */ ++ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs) { ++ String msg = "Expected that " + format(lhs) + " <= " + format(rhs); ++ assertLessThanOrEqual(lhs, rhs, msg); ++ } ++ ++ /** ++ * Asserts that {@code lhs} is less than or equal to {@code rhs}. ++ * ++ * @param lhs The left hand side of the comparison. ++ * @param rhs The right hand side of the comparison. ++ * @param msg A description of the assumption. ++ * @throws RuntimeException if the assertion isn't valid. ++ */ ++ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs, String msg) { ++ assertTrue(compare(lhs, rhs, msg) <= 0, msg); ++ } ++ ++ /** ++ * Shorthand for {@link #assertEquals(T, T)}. ++ * ++ * @see #assertEquals(T, T) ++ */ ++ public static void assertEQ(Object lhs, Object rhs) { ++ assertEquals(lhs, rhs); ++ } ++ ++ /** ++ * Shorthand for {@link #assertEquals(T, T, String)}. ++ * ++ * @see #assertEquals(T, T, String) ++ */ ++ public static void assertEQ(Object lhs, Object rhs, String msg) { ++ assertEquals(lhs, rhs, msg); ++ } ++ ++ /** ++ * Calls {@link #assertEquals(T, T, String)} with a default message. ++ * ++ * @see #assertEquals(T, T, String) ++ */ ++ public static void assertEquals(Object lhs, Object rhs) { ++ String msg = "Expected " + format(lhs) + " to equal " + format(rhs); ++ assertEquals(lhs, rhs, msg); ++ } ++ ++ /** ++ * Asserts that {@code lhs} is equal to {@code rhs}. ++ * ++ * @param lhs The left hand side of the comparison. ++ * @param rhs The right hand side of the comparison. ++ * @param msg A description of the assumption. ++ * @throws RuntimeException if the assertion isn't valid. ++ */ ++ public static void assertEquals(Object lhs, Object rhs, String msg) { ++ if (lhs == null) { ++ if (rhs != null) { ++ error(msg); ++ } ++ } else { ++ assertTrue(lhs.equals(rhs), msg); ++ } ++ } ++ ++ /** ++ * Shorthand for {@link #assertGreaterThanOrEqual(T, T)}. ++ * ++ * @see #assertGreaterThanOrEqual(T, T) ++ */ ++ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs) { ++ assertGreaterThanOrEqual(lhs, rhs); ++ } ++ ++ /** ++ * Shorthand for {@link #assertGreaterThanOrEqual(T, T, String)}. ++ * ++ * @see #assertGreaterThanOrEqual(T, T, String) ++ */ ++ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs, String msg) { ++ assertGreaterThanOrEqual(lhs, rhs, msg); ++ } ++ ++ /** ++ * Calls {@link #assertGreaterThanOrEqual(T, T, String)} with a default message. ++ * ++ * @see #assertGreaterThanOrEqual(T, T, String) ++ */ ++ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs) { ++ String msg = "Expected that " + format(lhs) + " >= " + format(rhs); ++ assertGreaterThanOrEqual(lhs, rhs, msg); ++ } ++ ++ /** ++ * Asserts that {@code lhs} is greater than or equal to {@code rhs}. ++ * ++ * @param lhs The left hand side of the comparison. ++ * @param rhs The right hand side of the comparison. ++ * @param msg A description of the assumption. ++ * @throws RuntimeException if the assertion isn't valid. ++ */ ++ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs, String msg) { ++ assertTrue(compare(lhs, rhs, msg) >= 0, msg); ++ } ++ ++ /** ++ * Shorthand for {@link #assertGreaterThan(T, T)}. ++ * ++ * @see #assertGreaterThan(T, T) ++ */ ++ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs) { ++ assertGreaterThan(lhs, rhs); ++ } ++ ++ /** ++ * Shorthand for {@link #assertGreaterThan(T, T, String)}. ++ * ++ * @see #assertGreaterThan(T, T, String) ++ */ ++ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs, String msg) { ++ assertGreaterThan(lhs, rhs, msg); ++ } ++ ++ /** ++ * Calls {@link #assertGreaterThan(T, T, String)} with a default message. ++ * ++ * @see #assertGreaterThan(T, T, String) ++ */ ++ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs) { ++ String msg = "Expected that " + format(lhs) + " > " + format(rhs); ++ assertGreaterThan(lhs, rhs, msg); ++ } ++ ++ /** ++ * Asserts that {@code lhs} is greater than {@code rhs}. ++ * ++ * @param lhs The left hand side of the comparison. ++ * @param rhs The right hand side of the comparison. ++ * @param msg A description of the assumption. ++ * @throws RuntimeException if the assertion isn't valid. ++ */ ++ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs, String msg) { ++ assertTrue(compare(lhs, rhs, msg) > 0, msg); ++ } ++ ++ /** ++ * Shorthand for {@link #assertNotEquals(T, T)}. ++ * ++ * @see #assertNotEquals(T, T) ++ */ ++ public static void assertNE(Object lhs, Object rhs) { ++ assertNotEquals(lhs, rhs); ++ } ++ ++ /** ++ * Shorthand for {@link #assertNotEquals(T, T, String)}. ++ * ++ * @see #assertNotEquals(T, T, String) ++ */ ++ public static void assertNE(Object lhs, Object rhs, String msg) { ++ assertNotEquals(lhs, rhs, msg); ++ } ++ ++ /** ++ * Calls {@link #assertNotEquals(T, T, String)} with a default message. ++ * ++ * @see #assertNotEquals(T, T, String) ++ */ ++ public static void assertNotEquals(Object lhs, Object rhs) { ++ String msg = "Expected " + format(lhs) + " to not equal " + format(rhs); ++ assertNotEquals(lhs, rhs, msg); ++ } ++ ++ /** ++ * Asserts that {@code lhs} is not equal to {@code rhs}. ++ * ++ * @param lhs The left hand side of the comparison. ++ * @param rhs The right hand side of the comparison. ++ * @param msg A description of the assumption. ++ * @throws RuntimeException if the assertion isn't valid. ++ */ ++ public static void assertNotEquals(Object lhs, Object rhs, String msg) { ++ if (lhs == null) { ++ if (rhs == null) { ++ error(msg); ++ } ++ } else { ++ assertFalse(lhs.equals(rhs), msg); ++ } ++ } ++ ++ /** ++ * Calls {@link #assertNull(Object, String)} with a default message. ++ * ++ * @see #assertNull(Object, String) ++ */ ++ public static void assertNull(Object o) { ++ assertNull(o, "Expected " + format(o) + " to be null"); ++ } ++ ++ /** ++ * Asserts that {@code o} is null. ++ * ++ * @param o The reference assumed to be null. ++ * @param msg A description of the assumption. ++ * @throws RuntimeException if the assertion isn't valid. ++ */ ++ public static void assertNull(Object o, String msg) { ++ assertEquals(o, null, msg); ++ } ++ ++ /** ++ * Calls {@link #assertNotNull(Object, String)} with a default message. ++ * ++ * @see #assertNotNull(Object, String) ++ */ ++ public static void assertNotNull(Object o) { ++ assertNotNull(o, "Expected non null reference"); ++ } ++ ++ /** ++ * Asserts that {@code o} is <i>not</i> null. ++ * ++ * @param o The reference assumed <i>not</i> to be null, ++ * @param msg A description of the assumption. ++ * @throws RuntimeException if the assertion isn't valid. ++ */ ++ public static void assertNotNull(Object o, String msg) { ++ assertNotEquals(o, null, msg); ++ } ++ ++ /** ++ * Calls {@link #assertFalse(boolean, String)} with a default message. ++ * ++ * @see #assertFalse(boolean, String) ++ */ ++ public static void assertFalse(boolean value) { ++ assertFalse(value, "Expected value to be false"); ++ } ++ ++ /** ++ * Asserts that {@code value} is {@code false}. ++ * ++ * @param value The value assumed to be false. ++ * @param msg A description of the assumption. ++ * @throws RuntimeException if the assertion isn't valid. ++ */ ++ public static void assertFalse(boolean value, String msg) { ++ assertTrue(!value, msg); ++ } ++ ++ /** ++ * Calls {@link #assertTrue(boolean, String)} with a default message. ++ * ++ * @see #assertTrue(boolean, String) ++ */ ++ public static void assertTrue(boolean value) { ++ assertTrue(value, "Expected value to be true"); ++ } ++ ++ /** ++ * Asserts that {@code value} is {@code true}. ++ * ++ * @param value The value assumed to be true. ++ * @param msg A description of the assumption. ++ * @throws RuntimeException if the assertion isn't valid. ++ */ ++ public static void assertTrue(boolean value, String msg) { ++ if (!value) { ++ error(msg); ++ } ++ } ++ ++ private static <T extends Comparable<T>> int compare(T lhs, T rhs, String msg) { ++ assertNotNull(lhs, msg); ++ assertNotNull(rhs, msg); ++ return lhs.compareTo(rhs); ++ } ++ ++ private static String format(Object o) { ++ return o == null? "null" : o.toString(); ++ } ++ ++ private static void error(String msg) { ++ throw new RuntimeException(msg); ++ } ++ ++} --- ./jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/FileUtils.java 2014-07-15 23:24:41.000000000 -0700 @@ -0,0 +1,194 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -112941,8 +118371,2035 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} + +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/InputArguments.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/InputArguments.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,88 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++package jdk.testlibrary; ++ ++import java.lang.management.RuntimeMXBean; ++import java.lang.management.ManagementFactory; ++import java.util.List; ++ ++/** ++ * This class provides access to the input arguments to the VM. ++ */ ++public class InputArguments { ++ private static final List<String> args; ++ ++ static { ++ RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean(); ++ args = runtimeMxBean.getInputArguments(); ++ } ++ ++ /** ++ * Returns true if {@code arg} is an input argument to the VM. ++ * ++ * This is useful for checking boolean flags such as -XX:+UseSerialGC or ++ * -XX:-UsePerfData. ++ * ++ * @param arg The name of the argument. ++ * @return {@code true} if the given argument is an input argument, ++ * otherwise {@code false}. ++ */ ++ public static boolean contains(String arg) { ++ return args.contains(arg); ++ } ++ ++ /** ++ * Returns true if {@code prefix} is the start of an input argument to the ++ * VM. ++ * ++ * This is useful for checking if flags describing a quantity, such as ++ * -XX:+MaxMetaspaceSize=100m, is set without having to know the quantity. ++ * To check if the flag -XX:MaxMetaspaceSize is set, use ++ * {@code InputArguments.containsPrefix("-XX:MaxMetaspaceSize")}. ++ * ++ * @param prefix The start of the argument. ++ * @return {@code true} if the given argument is the start of an input ++ * argument, otherwise {@code false}. ++ */ ++ public static boolean containsPrefix(String prefix) { ++ for (String arg : args) { ++ if (arg.startsWith(prefix)) { ++ return true; ++ } ++ } ++ return false; ++ } ++ ++ /** ++ * Get the string containing input arguments passed to the VM ++ */ ++ public static String getInputArguments() { ++ StringBuilder result = new StringBuilder(); ++ for (String arg : args) ++ result.append(arg).append(' '); ++ ++ return result.toString(); ++ } ++ ++} +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,106 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++package jdk.testlibrary; ++ ++import java.io.FileNotFoundException; ++import java.nio.file.Path; ++import java.nio.file.Paths; ++ ++public final class JDKToolFinder { ++ ++ private JDKToolFinder() { ++ } ++ ++ /** ++ * Returns the full path to an executable in jdk/bin based on System ++ * property {@code test.jdk} or {@code compile.jdk} (both are set by the jtreg test suite) ++ * ++ * @return Full path to an executable in jdk/bin ++ */ ++ public static String getJDKTool(String tool) { ++ ++ // First try to find the executable in test.jdk ++ try { ++ return getTool(tool, "test.jdk"); ++ } catch (FileNotFoundException e) { ++ ++ } ++ ++ // Now see if it's available in compile.jdk ++ try { ++ return getTool(tool, "compile.jdk"); ++ } catch (FileNotFoundException e) { ++ throw new RuntimeException("Failed to find " + tool + ++ ", looked in test.jdk (" + System.getProperty("test.jdk") + ++ ") and compile.jdk (" + System.getProperty("compile.jdk") + ")"); ++ } ++ } ++ ++ /** ++ * Returns the full path to an executable in jdk/bin based on System ++ * property {@code compile.jdk} ++ * ++ * @return Full path to an executable in jdk/bin ++ */ ++ public static String getCompileJDKTool(String tool) { ++ try { ++ return getTool(tool, "compile.jdk"); ++ } catch (FileNotFoundException e) { ++ throw new RuntimeException(e); ++ } ++ } ++ ++ /** ++ * Returns the full path to an executable in jdk/bin based on System ++ * property {@code test.jdk} ++ * ++ * @return Full path to an executable in jdk/bin ++ */ ++ public static String getTestJDKTool(String tool) { ++ try { ++ return getTool(tool, "test.jdk"); ++ } catch (FileNotFoundException e) { ++ throw new RuntimeException(e); ++ } ++ } ++ ++ private static String getTool(String tool, String property) throws FileNotFoundException { ++ String jdkPath = System.getProperty(property); ++ ++ if (jdkPath == null) { ++ throw new RuntimeException( ++ "System property '" + property + "' not set. This property is normally set by jtreg. " ++ + "When running test separately, set this property using '-D" + property + "=/path/to/jdk'."); ++ } ++ ++ Path toolName = Paths.get("bin", tool + (Platform.isWindows() ? ".exe" : "")); ++ ++ Path jdkTool = Paths.get(jdkPath, toolName.toString()); ++ if (!jdkTool.toFile().exists()) { ++ throw new FileNotFoundException("Could not find file " + jdkTool.toAbsolutePath()); ++ } ++ ++ return jdkTool.toAbsolutePath().toString(); ++ } ++} +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,134 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++package jdk.testlibrary; ++ ++import java.util.ArrayList; ++import java.util.Arrays; ++import java.util.List; ++ ++/** ++ * A utility for constructing command lines for starting JDK tool processes. ++ * ++ * The JDKToolLauncher can in particular be combined with a ++ * java.lang.ProcessBuilder to easily run a JDK tool. For example, the following ++ * code run {@code jmap -heap} against a process with GC logging turned on for ++ * the {@code jmap} process: ++ * ++ * <pre> ++ * {@code ++ * JDKToolLauncher jmap = JDKToolLauncher.create("jmap") ++ * .addVMArg("-XX:+PrintGC"); ++ * .addVMArg("-XX:+PrintGCDetails") ++ * .addToolArg("-heap") ++ * .addToolArg(pid); ++ * ProcessBuilder pb = new ProcessBuilder(jmap.getCommand()); ++ * Process p = pb.start(); ++ * } ++ * </pre> ++ */ ++public class JDKToolLauncher { ++ private final String executable; ++ private final List<String> vmArgs = new ArrayList<String>(); ++ private final List<String> toolArgs = new ArrayList<String>(); ++ ++ private JDKToolLauncher(String tool, boolean useCompilerJDK) { ++ if (useCompilerJDK) { ++ executable = JDKToolFinder.getJDKTool(tool); ++ } else { ++ executable = JDKToolFinder.getTestJDKTool(tool); ++ } ++ vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs())); ++ } ++ ++ /** ++ * Creates a new JDKToolLauncher for the specified tool. Using tools path ++ * from the compiler JDK. ++ * ++ * @param tool ++ * The name of the tool ++ * @return A new JDKToolLauncher ++ */ ++ public static JDKToolLauncher create(String tool) { ++ return new JDKToolLauncher(tool, true); ++ } ++ ++ /** ++ * Creates a new JDKToolLauncher for the specified tool in the Tested JDK. ++ * ++ * @param tool ++ * The name of the tool ++ * ++ * @return A new JDKToolLauncher ++ */ ++ public static JDKToolLauncher createUsingTestJDK(String tool) { ++ return new JDKToolLauncher(tool, false); ++ } ++ ++ /** ++ * Adds an argument to the JVM running the tool. ++ * ++ * The JVM arguments are passed to the underlying JVM running the tool. ++ * Arguments will automatically be prepended with "-J". ++ * ++ * Any platform specific arguments required for running the tool are ++ * automatically added. ++ * ++ * ++ * @param arg ++ * The argument to VM running the tool ++ * @return The JDKToolLauncher instance ++ */ ++ public JDKToolLauncher addVMArg(String arg) { ++ vmArgs.add(arg); ++ return this; ++ } ++ ++ /** ++ * Adds an argument to the tool. ++ * ++ * @param arg ++ * The argument to the tool ++ * @return The JDKToolLauncher instance ++ */ ++ public JDKToolLauncher addToolArg(String arg) { ++ toolArgs.add(arg); ++ return this; ++ } ++ ++ /** ++ * Returns the command that can be used for running the tool. ++ * ++ * @return An array whose elements are the arguments of the command. ++ */ ++ public String[] getCommand() { ++ List<String> command = new ArrayList<String>(); ++ command.add(executable); ++ // Add -J in front of all vmArgs ++ for (String arg : vmArgs) { ++ command.add("-J" + arg); ++ } ++ command.addAll(toolArgs); ++ return command.toArray(new String[command.size()]); ++ } ++} +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/JcmdBase.java 2013-09-06 11:30:01.000000000 -0700 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JcmdBase.java 2014-07-15 23:24:41.000000000 -0700 +@@ -23,8 +23,11 @@ + + package jdk.testlibrary; + +-import java.util.ArrayList; ++import java.util.Arrays; + ++/** ++ * Super class for tests which need to attach jcmd to the current process. ++ */ + public class JcmdBase { + + private static ProcessBuilder processBuilder = new ProcessBuilder(); +@@ -32,46 +35,24 @@ + /** + * Attach jcmd to the current process + * +- * @param commandArgs +- * jcmd command line parameters, e.g. JFR.start ++ * @param toolArgs ++ * jcmd command line parameters, e.g. VM.flags + * @return jcmd output + * @throws Exception + */ +- public final static OutputAnalyzer jcmd(String... commandArgs) ++ public final static OutputAnalyzer jcmd(String... toolArgs) + throws Exception { +- ArrayList<String> cmd = new ArrayList<String>(); +- String cmdString = ""; +- +- // jcmd from the jdk to be tested +- String jcmdPath = JdkFinder.getTool("jcmd", false); +- cmd.add(jcmdPath); +- cmdString += jcmdPath; +- +- String pid = Integer.toString(ProcessTools.getProcessId()); +- cmd.add(pid); +- cmdString += " " + pid; +- +- for (int i = 0; i < commandArgs.length; i++) { +- cmd.add(commandArgs[i]); +- cmdString += " " + commandArgs[i]; ++ JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jcmd"); ++ launcher.addToolArg(Integer.toString(ProcessTools.getProcessId())); ++ for (String toolArg : toolArgs) { ++ launcher.addToolArg(toolArg); + } +- +- // Log command line for debugging purpose +- System.out.println("Command line:"); +- System.out.println(cmdString); +- +- processBuilder.command(cmd); ++ processBuilder.command(launcher.getCommand()); ++ System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", "")); + OutputAnalyzer output = new OutputAnalyzer(processBuilder.start()); +- +- // Log output for debugging purpose +- System.out.println("Command output:"); + System.out.println(output.getOutput()); + +- if (output.getExitValue() != 0) { +- throw new Exception(processBuilder.command() +- + " resulted in exit value " + output.getExitValue() +- + " , expected to get 0"); +- } ++ output.shouldHaveExitValue(0); + + return output; + } +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java 2013-09-06 11:30:01.000000000 -0700 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/JdkFinder.java 1969-12-31 16:00:00.000000000 -0800 +@@ -1,78 +0,0 @@ +-/* +- * Copyright (c) 2013, 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 if you need additional information or have any +- * questions. +- */ +- +-package jdk.testlibrary; +- +-import java.io.File; +- +-public final class JdkFinder { +- +- private JdkFinder() { +- } +- +- private static String getExecutable(String executable, String property) { +- String binPath = System.getProperty(property); +- if (binPath == null) { +- throw new RuntimeException( +- "System property '" + property + "' not set"); +- } +- +- binPath += File.separatorChar + "bin" + File.separatorChar + executable; +- +- return binPath; +- } +- +- /** +- * Returns the full path to a java launcher in jdk/bin based on system +- * property. +- * +- * @param stableJdk +- * see {@link #getTool(String, boolean)} +- * @return Full path to a java launcher in jdk/bin. +- */ +- public static String getJavaLauncher(boolean stableJdk) { +- return getTool("java", stableJdk); +- } +- +- /** +- * Returns the full path to an executable in jdk/bin based on system +- * property. Depending on value of {@code stableJdk} the method will look for +- * either 'compile.jdk' or 'test.jdk' system properties. +- * 'test.jdk' is normally set by jtreg. When running test separately, +- * set this property using '-Dtest.jdk=/path/to/jdk'. +- * +- * @param stableJdk +- * If {@code true} the {@code tool} will be retrieved +- * from the compile (stable) JDK. +- * If {@code false} the {@code tool} will be retrieved +- * from the test JDK. +- * @return Full path to an executable in jdk/bin. +- */ +- public static String getTool(String tool, boolean stableJdk) { +- if (stableJdk) { +- return getExecutable(tool, "compile.jdk"); +- } else { +- return getExecutable(tool, "test.jdk"); +- } +- } +-} +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java 2013-09-06 11:30:01.000000000 -0700 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java 2014-07-15 23:24:41.000000000 -0700 +@@ -27,6 +27,9 @@ + import java.util.regex.Matcher; + import java.util.regex.Pattern; + ++/** ++ * Utility class for verifying output and exit value from a {@code Process}. ++ */ + public final class OutputAnalyzer { + + private final String stdout; +@@ -85,9 +88,9 @@ + public void shouldContain(String expectedString) { + if (!stdout.contains(expectedString) + && !stderr.contains(expectedString)) { ++ reportDiagnosticSummary(); + throw new RuntimeException("'" + expectedString +- + "' missing from stdout/stderr: [" + stdout + stderr +- + "]\n"); ++ + "' missing from stdout/stderr \n"); + } + } + +@@ -101,8 +104,9 @@ + */ + public void stdoutShouldContain(String expectedString) { + if (!stdout.contains(expectedString)) { ++ reportDiagnosticSummary(); + throw new RuntimeException("'" + expectedString +- + "' missing from stdout: [" + stdout + "]\n"); ++ + "' missing from stdout \n"); + } + } + +@@ -116,8 +120,9 @@ + */ + public void stderrShouldContain(String expectedString) { + if (!stderr.contains(expectedString)) { ++ reportDiagnosticSummary(); + throw new RuntimeException("'" + expectedString +- + "' missing from stderr: [" + stderr + "]\n"); ++ + "' missing from stderr \n"); + } + } + +@@ -132,12 +137,14 @@ + */ + public void shouldNotContain(String notExpectedString) { + if (stdout.contains(notExpectedString)) { ++ reportDiagnosticSummary(); + throw new RuntimeException("'" + notExpectedString +- + "' found in stdout: [" + stdout + "]\n"); ++ + "' found in stdout \n"); + } + if (stderr.contains(notExpectedString)) { ++ reportDiagnosticSummary(); + throw new RuntimeException("'" + notExpectedString +- + "' found in stderr: [" + stderr + "]\n"); ++ + "' found in stderr \n"); + } + } + +@@ -152,8 +159,9 @@ + */ + public void stdoutShouldNotContain(String notExpectedString) { + if (stdout.contains(notExpectedString)) { ++ reportDiagnosticSummary(); + throw new RuntimeException("'" + notExpectedString +- + "' found in stdout: [" + stdout + "]\n"); ++ + "' found in stdout \n"); + } + } + +@@ -168,55 +176,63 @@ + */ + public void stderrShouldNotContain(String notExpectedString) { + if (stderr.contains(notExpectedString)) { ++ reportDiagnosticSummary(); + throw new RuntimeException("'" + notExpectedString +- + "' found in stderr: [" + stderr + "]\n"); ++ + "' found in stderr \n"); + } + } + + /** +- * Verify that the stdout and stderr contents of output buffer matches +- * the pattern ++ * Verify that the stdout and stderr contents of output buffer matches the ++ * pattern + * + * @param pattern +- * @throws RuntimeException If the pattern was not found ++ * @throws RuntimeException ++ * If the pattern was not found + */ + public void shouldMatch(String pattern) { +- Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout); +- Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr); ++ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE) ++ .matcher(stdout); ++ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE) ++ .matcher(stderr); + if (!stdoutMatcher.find() && !stderrMatcher.find()) { ++ reportDiagnosticSummary(); + throw new RuntimeException("'" + pattern +- + "' missing from stdout/stderr: [" + stdout + stderr +- + "]\n"); ++ + "' missing from stdout/stderr \n"); + } + } + + /** +- * Verify that the stdout contents of output buffer matches the +- * pattern ++ * Verify that the stdout contents of output buffer matches the pattern + * + * @param pattern +- * @throws RuntimeException If the pattern was not found ++ * @throws RuntimeException ++ * If the pattern was not found + */ + public void stdoutShouldMatch(String pattern) { +- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout); ++ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher( ++ stdout); + if (!matcher.find()) { ++ reportDiagnosticSummary(); + throw new RuntimeException("'" + pattern +- + "' missing from stdout: [" + stdout + "]\n"); ++ + "' missing from stdout \n"); + } + } + + /** +- * Verify that the stderr contents of output buffer matches the +- * pattern ++ * Verify that the stderr contents of output buffer matches the pattern + * + * @param pattern +- * @throws RuntimeException If the pattern was not found ++ * @throws RuntimeException ++ * If the pattern was not found + */ + public void stderrShouldMatch(String pattern) { +- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr); ++ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher( ++ stderr); + if (!matcher.find()) { ++ reportDiagnosticSummary(); + throw new RuntimeException("'" + pattern +- + "' missing from stderr: [" + stderr + "]\n"); ++ + "' missing from stderr \n"); + } + } + +@@ -225,18 +241,22 @@ + * match the pattern + * + * @param pattern +- * @throws RuntimeException If the pattern was found ++ * @throws RuntimeException ++ * If the pattern was found + */ + public void shouldNotMatch(String pattern) { +- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout); ++ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher( ++ stdout); + if (matcher.find()) { +- throw new RuntimeException("'" + pattern +- + "' found in stdout: [" + stdout + "]\n"); ++ reportDiagnosticSummary(); ++ throw new RuntimeException("'" + pattern + "' found in stdout: '" ++ + matcher.group() + "' \n"); + } + matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr); + if (matcher.find()) { +- throw new RuntimeException("'" + pattern +- + "' found in stderr: [" + stderr + "]\n"); ++ reportDiagnosticSummary(); ++ throw new RuntimeException("'" + pattern + "' found in stderr: '" ++ + matcher.group() + "' \n"); + } + } + +@@ -245,13 +265,15 @@ + * pattern + * + * @param pattern +- * @throws RuntimeException If the pattern was found ++ * @throws RuntimeException ++ * If the pattern was found + */ + public void stdoutShouldNotMatch(String pattern) { +- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout); ++ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher( ++ stdout); + if (matcher.find()) { +- throw new RuntimeException("'" + pattern +- + "' found in stdout: [" + stdout + "]\n"); ++ reportDiagnosticSummary(); ++ throw new RuntimeException("'" + pattern + "' found in stdout \n"); + } + } + +@@ -260,18 +282,56 @@ + * pattern + * + * @param pattern +- * @throws RuntimeException If the pattern was found ++ * @throws RuntimeException ++ * If the pattern was found + */ + public void stderrShouldNotMatch(String pattern) { +- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr); ++ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher( ++ stderr); + if (matcher.find()) { +- throw new RuntimeException("'" + pattern +- + "' found in stderr: [" + stderr + "]\n"); ++ reportDiagnosticSummary(); ++ throw new RuntimeException("'" + pattern + "' found in stderr \n"); ++ } ++ } ++ ++ /** ++ * Get the captured group of the first string matching the pattern. stderr ++ * is searched before stdout. ++ * ++ * @param pattern ++ * The multi-line pattern to match ++ * @param group ++ * The group to capture ++ * @return The matched string or null if no match was found ++ */ ++ public String firstMatch(String pattern, int group) { ++ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE) ++ .matcher(stderr); ++ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE) ++ .matcher(stdout); ++ if (stderrMatcher.find()) { ++ return stderrMatcher.group(group); + } ++ if (stdoutMatcher.find()) { ++ return stdoutMatcher.group(group); ++ } ++ return null; ++ } ++ ++ /** ++ * Get the first string matching the pattern. stderr is searched before ++ * stdout. ++ * ++ * @param pattern ++ * The multi-line pattern to match ++ * @return The matched string or null if no match was found ++ */ ++ public String firstMatch(String pattern) { ++ return firstMatch(pattern, 0); + } + + /** +- * Verifiy the exit value of the process ++ * Verify the exit value of the process + * + * @param expectedExitValue + * Expected exit value from process +@@ -281,12 +341,25 @@ + */ + public void shouldHaveExitValue(int expectedExitValue) { + if (getExitValue() != expectedExitValue) { +- throw new RuntimeException("Exit value " + getExitValue() +- + " , expected to get " + expectedExitValue); ++ reportDiagnosticSummary(); ++ throw new RuntimeException("Expected to get exit value of [" ++ + expectedExitValue + "]\n"); + } + } + + /** ++ * Report summary that will help to diagnose the problem Currently includes: ++ * - standard input produced by the process under test - standard output - ++ * exit code Note: the command line is printed by the ProcessTools ++ */ ++ private void reportDiagnosticSummary() { ++ String msg = " stdout: [" + stdout + "];\n" + " stderr: [" + stderr ++ + "]\n" + " exitValue = " + getExitValue() + "\n"; ++ ++ System.err.println(msg); ++ } ++ ++ /** + * Get the contents of the output buffer (stdout and stderr) + * + * @return Content of the output buffer +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,108 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++package jdk.testlibrary; ++ ++public class Platform { ++ private static final String osName = System.getProperty("os.name"); ++ private static final String dataModel = System.getProperty("sun.arch.data.model"); ++ private static final String vmVersion = System.getProperty("java.vm.version"); ++ private static final String osArch = System.getProperty("os.arch"); ++ ++ public static boolean is32bit() { ++ return dataModel.equals("32"); ++ } ++ ++ public static boolean is64bit() { ++ return dataModel.equals("64"); ++ } ++ ++ public static boolean isSolaris() { ++ return isOs("sunos"); ++ } ++ ++ public static boolean isWindows() { ++ return isOs("win"); ++ } ++ ++ public static boolean isOSX() { ++ return isOs("mac"); ++ } ++ ++ public static boolean isLinux() { ++ return isOs("linux"); ++ } ++ ++ public static boolean isBSD() { ++ return isOs("bsd"); ++ } ++ ++ private static boolean isOs(String osname) { ++ return (osName.toLowerCase().startsWith(osname.toLowerCase()) || ++ osName.toLowerCase().endsWith(osname.toLowerCase())); ++ } ++ ++ public static String getOsName() { ++ return osName; ++ } ++ ++ public static boolean isDebugBuild() { ++ return vmVersion.toLowerCase().contains("debug"); ++ } ++ ++ public static String getVMVersion() { ++ return vmVersion; ++ } ++ ++ // Returns true for sparc and sparcv9. ++ public static boolean isSparc() { ++ return isArch("sparc"); ++ } ++ ++ public static boolean isARM() { ++ return isArch("arm"); ++ } ++ ++ public static boolean isPPC() { ++ return isArch("ppc"); ++ } ++ ++ public static boolean isX86() { ++ // On Linux it's 'i386', Windows 'x86' ++ return (isArch("i386") || isArch("x86")); ++ } ++ ++ public static boolean isX64() { ++ // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64' ++ return (isArch("amd64") || isArch("x86_64")); ++ } ++ ++ private static boolean isArch(String archname) { ++ return osArch.toLowerCase().startsWith(archname.toLowerCase()); ++ } ++ ++ public static String getOsArch() { ++ return osArch; ++ } ++ ++} +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessThread.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessThread.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,143 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++package jdk.testlibrary; ++ ++import static jdk.testlibrary.Asserts.assertNotEquals; ++import static jdk.testlibrary.Asserts.assertTrue; ++ ++import java.util.List; ++import java.util.concurrent.CountDownLatch; ++ ++/** ++ * The helper class for starting and stopping {@link Process} in a separate thread. ++ */ ++public class ProcessThread extends TestThread { ++ ++ /** ++ * Creates a new {@code ProcessThread} object. ++ * ++ * @param threadName The name of thread ++ * @param cmd The string array of program and its arguments to pass to {@link ProcessBuilder} ++ */ ++ public ProcessThread(String threadName, String... cmd) { ++ super(new ProcessRunnable(new ProcessBuilder(cmd)), threadName); ++ } ++ ++ /** ++ * Creates a new {@code ProcessThread} object. ++ * ++ * @param threadName The name of thread. ++ * @param pb The ProcessBuilder to execute. ++ */ ++ public ProcessThread(String threadName, ProcessBuilder pb) { ++ super(new ProcessRunnable(pb), threadName); ++ } ++ ++ /** ++ * Stops {@link Process} started by {@code ProcessRunnable}. ++ * ++ * @throws InterruptedException ++ */ ++ public void stopProcess() throws InterruptedException { ++ ((ProcessRunnable) getRunnable()).stopProcess(); ++ } ++ ++ /** ++ * @return The process output, or null if the process has not yet completed. ++ */ ++ public OutputAnalyzer getOutput() { ++ return ((ProcessRunnable) getRunnable()).getOutput(); ++ } ++ ++ /** ++ * {@link Runnable} interface for starting and stopping {@link Process}. ++ */ ++ static class ProcessRunnable extends XRun { ++ ++ private final ProcessBuilder processBuilder; ++ private final CountDownLatch latch; ++ private volatile Process process; ++ private volatile OutputAnalyzer output; ++ ++ /** ++ * Creates a new {@code ProcessRunnable} object. ++ * ++ * @param pb The {@link ProcessBuilder} to run. ++ */ ++ public ProcessRunnable(ProcessBuilder pb) { ++ super(); ++ this.processBuilder = pb; ++ this.latch = new CountDownLatch(1); ++ } ++ ++ /** ++ * Starts the process in {@code ProcessThread}. ++ * All exceptions which occurs here will be caught and stored in {@code ProcessThread}. ++ * ++ * see {@link XRun} ++ */ ++ @Override ++ public void xrun() throws Throwable { ++ this.process = processBuilder.start(); ++ // Release when process is started ++ latch.countDown(); ++ ++ // Will block... ++ try { ++ output = new OutputAnalyzer(this.process); ++ } catch (Throwable t) { ++ String name = Thread.currentThread().getName(); ++ System.out.println(String.format("ProcessThread[%s] failed: %s", name, t.toString())); ++ throw t; ++ } finally { ++ String logMsg = ProcessTools.getProcessLog(processBuilder, output); ++ System.out.println(logMsg); ++ } ++ } ++ ++ /** ++ * Stops the process. ++ * ++ * @throws InterruptedException ++ */ ++ public void stopProcess() throws InterruptedException { ++ // Wait until process is started ++ latch.await(); ++ if (this.process != null) { ++ System.out.println("ProcessThread.stopProcess() will kill process"); ++ this.process.destroy(); ++ } ++ } ++ ++ /** ++ * Returns the OutputAnalyzer with stdout/stderr from the process. ++ * @return The process output, or null if process not completed. ++ * @throws InterruptedException ++ */ ++ public OutputAnalyzer getOutput() { ++ return output; ++ } ++ } ++ ++} +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java 2013-09-06 11:30:01.000000000 -0700 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java 2014-07-15 23:24:41.000000000 -0700 +@@ -25,24 +25,107 @@ + + import java.io.ByteArrayOutputStream; + import java.io.IOException; ++import java.io.PrintStream; + import java.lang.management.ManagementFactory; + import java.lang.management.RuntimeMXBean; + import java.lang.reflect.Field; + import java.lang.reflect.Method; + import java.util.ArrayList; + import java.util.Collections; ++import java.util.Map; ++import java.util.concurrent.ExecutionException; ++import java.util.concurrent.Future; ++import java.util.concurrent.Phaser; ++import java.util.concurrent.TimeUnit; ++import java.util.concurrent.TimeoutException; + + import sun.management.VMManagement; + + public final class ProcessTools { ++ private static final class LineForwarder extends StreamPumper.LinePump { ++ private final PrintStream ps; ++ private final String prefix; ++ LineForwarder(String prefix, PrintStream os) { ++ this.ps = os; ++ this.prefix = prefix; ++ } ++ @Override ++ protected void processLine(String line) { ++ ps.println("[" + prefix + "] " + line); ++ } ++ } + + private ProcessTools() { + } + + /** ++ * <p>Starts a process from its builder.</p> ++ * <span>The default redirects of STDOUT and STDERR are started</span> ++ * @param name The process name ++ * @param processBuilder The process builder ++ * @return Returns the initialized process ++ * @throws IOException ++ */ ++ public static Process startProcess(String name, ++ ProcessBuilder processBuilder) ++ throws IOException { ++ Process p = null; ++ try { ++ p = startProcess(name, processBuilder, -1, TimeUnit.NANOSECONDS); ++ } catch (InterruptedException | TimeoutException e) { ++ // can't ever happen ++ } ++ return p; ++ } ++ ++ /** ++ * <p>Starts a process from its builder.</p> ++ * <span>The default redirects of STDOUT and STDERR are started</span> ++ * @param name The process name ++ * @param processBuilder The process builder ++ * @param timeout The timeout for the warmup waiting ++ * @param unit The timeout {@linkplain TimeUnit} ++ * @return Returns the initialized {@linkplain Process} ++ * @throws IOException ++ * @throws InterruptedException ++ * @throws TimeoutException ++ */ ++ public static Process startProcess(String name, ++ ProcessBuilder processBuilder, ++ long timeout, ++ TimeUnit unit) ++ throws IOException, InterruptedException, TimeoutException { ++ Process p = processBuilder.start(); ++ StreamPumper stdout = new StreamPumper(p.getInputStream()); ++ StreamPumper stderr = new StreamPumper(p.getErrorStream()); ++ ++ stdout.addPump(new LineForwarder(name, System.out)); ++ stderr.addPump(new LineForwarder(name, System.err)); ++ final Phaser phs = new Phaser(1); ++ Future<Void> stdoutTask = stdout.process(); ++ Future<Void> stderrTask = stderr.process(); ++ ++ try { ++ if (timeout > -1) { ++ phs.awaitAdvanceInterruptibly(0, timeout, unit); ++ } ++ } catch (TimeoutException | InterruptedException e) { ++ System.err.println("Failed to start a process (thread dump follows)"); ++ for(Map.Entry<Thread, StackTraceElement[]> s : Thread.getAllStackTraces().entrySet()) { ++ printStack(s.getKey(), s.getValue()); ++ } ++ stdoutTask.cancel(true); ++ stderrTask.cancel(true); ++ throw e; ++ } ++ ++ return p; ++ } ++ ++ /** + * Pumps stdout and stderr from running the process into a String. + * +- * @param processHandler ++ * @param processBuilder + * ProcessHandler to run. + * @return Output from process. + * @throws IOException +@@ -69,22 +152,19 @@ + stdoutBuffer); + StreamPumper errPumper = new StreamPumper(process.getErrorStream(), + stderrBuffer); +- Thread outPumperThread = new Thread(outPumper); +- Thread errPumperThread = new Thread(errPumper); +- +- outPumperThread.setDaemon(true); +- errPumperThread.setDaemon(true); + +- outPumperThread.start(); +- errPumperThread.start(); ++ Future<Void> outTask = outPumper.process(); ++ Future<Void> errTask = errPumper.process(); + + try { + process.waitFor(); +- outPumperThread.join(); +- errPumperThread.join(); ++ outTask.get(); ++ errTask.get(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return null; ++ } catch (ExecutionException e) { ++ throw new IOException(e); + } + + return new OutputBuffer(stdoutBuffer.toString(), +@@ -137,15 +217,106 @@ + */ + public static ProcessBuilder createJavaProcessBuilder(String... command) + throws Exception { +- String javapath = JdkFinder.getJavaLauncher(false); ++ String javapath = JDKToolFinder.getJDKTool("java"); + + ArrayList<String> args = new ArrayList<>(); + args.add(javapath); + Collections.addAll(args, getPlatformSpecificVMArgs()); + Collections.addAll(args, command); + ++ // Reporting ++ StringBuilder cmdLine = new StringBuilder(); ++ for (String cmd : args) ++ cmdLine.append(cmd).append(' '); ++ System.out.println("Command line: [" + cmdLine.toString() + "]"); ++ + return new ProcessBuilder(args.toArray(new String[args.size()])); ++ } ++ ++ private static void printStack(Thread t, StackTraceElement[] stack) { ++ System.out.println("\t" + t + ++ " stack: (length = " + stack.length + ")"); ++ if (t != null) { ++ for (StackTraceElement stack1 : stack) { ++ System.out.println("\t" + stack1); ++ } ++ System.out.println(); ++ } ++ } ++ ++ /** ++ * Executes a test jvm process, waits for it to finish and returns the process output. ++ * The default jvm options from jtreg, test.vm.opts and test.java.opts, are added. ++ * The java from the test.jdk is used to execute the command. ++ * ++ * The command line will be like: ++ * {test.jdk}/bin/java {test.vm.opts} {test.java.opts} cmds ++ * ++ * @param cmds User specifed arguments. ++ * @return The output from the process. ++ */ ++ public static OutputAnalyzer executeTestJvm(String... cmds) throws Throwable { ++ ProcessBuilder pb = createJavaProcessBuilder(Utils.addTestJavaOpts(cmds)); ++ return executeProcess(pb); ++ } ++ ++ /** ++ * Executes a process, waits for it to finish and returns the process output. ++ * @param pb The ProcessBuilder to execute. ++ * @return The output from the process. ++ */ ++ public static OutputAnalyzer executeProcess(ProcessBuilder pb) throws Throwable { ++ OutputAnalyzer output = null; ++ try { ++ output = new OutputAnalyzer(pb.start()); ++ return output; ++ } catch (Throwable t) { ++ System.out.println("executeProcess() failed: " + t); ++ throw t; ++ } finally { ++ System.out.println(getProcessLog(pb, output)); ++ } ++ } ++ ++ /** ++ * Executes a process, waits for it to finish and returns the process output. ++ * @param cmds The command line to execute. ++ * @return The output from the process. ++ */ ++ public static OutputAnalyzer executeProcess(String... cmds) throws Throwable { ++ return executeProcess(new ProcessBuilder(cmds)); ++ } + ++ /** ++ * Used to log command line, stdout, stderr and exit code from an executed process. ++ * @param pb The executed process. ++ * @param output The output from the process. ++ */ ++ public static String getProcessLog(ProcessBuilder pb, OutputAnalyzer output) { ++ String stderr = output == null ? "null" : output.getStderr(); ++ String stdout = output == null ? "null" : output.getStdout(); ++ String exitValue = output == null ? "null": Integer.toString(output.getExitValue()); ++ StringBuilder logMsg = new StringBuilder(); ++ final String nl = System.getProperty("line.separator"); ++ logMsg.append("--- ProcessLog ---" + nl); ++ logMsg.append("cmd: " + getCommandLine(pb) + nl); ++ logMsg.append("exitvalue: " + exitValue + nl); ++ logMsg.append("stderr: " + stderr + nl); ++ logMsg.append("stdout: " + stdout + nl); ++ return logMsg.toString(); + } + ++ /** ++ * @return The full command line for the ProcessBuilder. ++ */ ++ public static String getCommandLine(ProcessBuilder pb) { ++ if (pb == null) { ++ return "null"; ++ } ++ StringBuilder cmd = new StringBuilder(); ++ for (String s : pb.command()) { ++ cmd.append(s).append(" "); ++ } ++ return cmd.toString().trim(); ++ } + } +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java 2013-09-06 11:30:01.000000000 -0700 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/StreamPumper.java 2014-07-15 23:24:41.000000000 -0700 +@@ -23,16 +23,65 @@ + + package jdk.testlibrary; + ++import java.io.BufferedInputStream; ++import java.io.ByteArrayOutputStream; + import java.io.OutputStream; + import java.io.InputStream; + import java.io.IOException; ++import java.util.HashSet; ++import java.util.Set; ++import java.util.concurrent.Future; ++import java.util.concurrent.FutureTask; ++import java.util.concurrent.atomic.AtomicBoolean; + + public final class StreamPumper implements Runnable { + + private static final int BUF_SIZE = 256; + +- private final OutputStream out; ++ /** ++ * Pump will be called by the StreamPumper to process the incoming data ++ */ ++ abstract public static class Pump { ++ abstract void register(StreamPumper d); ++ } ++ ++ /** ++ * OutputStream -> Pump adapter ++ */ ++ final public static class StreamPump extends Pump { ++ private final OutputStream out; ++ public StreamPump(OutputStream out) { ++ this.out = out; ++ } ++ ++ @Override ++ void register(StreamPumper sp) { ++ sp.addOutputStream(out); ++ } ++ } ++ ++ /** ++ * Used to process the incoming data line-by-line ++ */ ++ abstract public static class LinePump extends Pump { ++ @Override ++ final void register(StreamPumper sp) { ++ sp.addLineProcessor(this); ++ } ++ ++ abstract protected void processLine(String line); ++ } ++ + private final InputStream in; ++ private final Set<OutputStream> outStreams = new HashSet<>(); ++ private final Set<LinePump> linePumps = new HashSet<>(); ++ ++ private final AtomicBoolean processing = new AtomicBoolean(false); ++ private final FutureTask<Void> processingTask = new FutureTask(this, null); ++ ++ public StreamPumper(InputStream in) { ++ this.in = in; ++ } + + /** + * Create a StreamPumper that reads from in and writes to out. +@@ -43,8 +92,8 @@ + * The stream to write to. + */ + public StreamPumper(InputStream in, OutputStream out) { +- this.in = in; +- this.out = out; ++ this(in); ++ this.addOutputStream(out); + } + + /** +@@ -54,25 +103,97 @@ + */ + @Override + public void run() { +- int length; +- InputStream localIn = in; +- OutputStream localOut = out; +- byte[] buffer = new byte[BUF_SIZE]; +- +- try { +- while ((length = localIn.read(buffer)) > 0 && !Thread.interrupted()) { +- localOut.write(buffer, 0, length); ++ try (BufferedInputStream is = new BufferedInputStream(in)) { ++ ByteArrayOutputStream lineBos = new ByteArrayOutputStream(); ++ byte[] buf = new byte[BUF_SIZE]; ++ int len = 0; ++ int linelen = 0; ++ ++ while ((len = is.read(buf)) > 0 && !Thread.interrupted()) { ++ for(OutputStream out : outStreams) { ++ out.write(buf, 0, len); ++ } ++ if (!linePumps.isEmpty()) { ++ int i = 0; ++ int lastcrlf = -1; ++ while (i < len) { ++ if (buf[i] == '\n' || buf[i] == '\r') { ++ int bufLinelen = i - lastcrlf - 1; ++ if (bufLinelen > 0) { ++ lineBos.write(buf, lastcrlf + 1, bufLinelen); ++ } ++ linelen += bufLinelen; ++ ++ if (linelen > 0) { ++ lineBos.flush(); ++ final String line = lineBos.toString(); ++ for (LinePump lp : linePumps) { ++ lp.processLine(line); ++ }; ++ lineBos.reset(); ++ linelen = 0; ++ } ++ lastcrlf = i; ++ } ++ ++ i++; ++ } ++ if (lastcrlf == -1) { ++ lineBos.write(buf, 0, len); ++ linelen += len; ++ } else if (lastcrlf < len - 1) { ++ lineBos.write(buf, lastcrlf + 1, len - lastcrlf - 1); ++ linelen += len - lastcrlf - 1; ++ } ++ } + } ++ + } catch (IOException e) { +- // Just abort if something like this happens. + e.printStackTrace(); + } finally { ++ for(OutputStream out : outStreams) { ++ try { ++ out.flush(); ++ } catch (IOException e) {} ++ } + try { +- localOut.flush(); + in.close(); +- } catch (IOException e) { +- e.printStackTrace(); +- } ++ } catch (IOException e) {} + } + } ++ ++ final void addOutputStream(OutputStream out) { ++ outStreams.add(out); ++ } ++ ++ final void addLineProcessor(LinePump lp) { ++ linePumps.add(lp); ++ } ++ ++ final public StreamPumper addPump(Pump ... pump) { ++ if (processing.get()) { ++ throw new IllegalStateException("Can not modify pumper while " + ++ "processing is in progress"); ++ } ++ for(Pump p : pump) { ++ p.register(this); ++ } ++ return this; ++ } ++ ++ final public Future<Void> process() { ++ if (!processing.compareAndSet(false, true)) { ++ throw new IllegalStateException("Can not re-run the processing"); ++ } ++ Thread t = new Thread(new Runnable() { ++ @Override ++ public void run() { ++ processingTask.run(); ++ } ++ }); ++ t.setDaemon(true); ++ t.start(); ++ ++ return processingTask; ++ } + } +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/TestThread.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/TestThread.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,249 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++package jdk.testlibrary; ++ ++import java.lang.management.ManagementFactory; ++import java.lang.management.ThreadInfo; ++import java.lang.management.ThreadMXBean; ++import java.util.concurrent.TimeoutException; ++ ++/** ++ * Thread which catches exceptions thrown during the execution ++ * and stores them for later analysis. ++ * ++ * <pre> ++ * {@code ++ * TestThread thread = new TestThread(new XRun() { ++ * public void run() { ++ * // do something ++ * } ++ * }); ++ * thread.start(); ++ * // do something ++ * Throwable uncaught = thread.getUncaught(); ++ * } ++ * </pre> ++ */ ++public class TestThread extends Thread { ++ ++ private final Runnable runnable; ++ private volatile Throwable uncaught; ++ ++ /** ++ * Returns {@link Runnable} the thread has been created with. ++ * ++ * @return The object whose {@code run} method is called ++ */ ++ public Runnable getRunnable() { ++ return runnable; ++ } ++ ++ /** ++ * Creates a new {@code TestThread} object. ++ * ++ * @param target The object whose {@code run} method is called ++ * @param name The thread name ++ */ ++ public TestThread(Runnable target, String name) { ++ super(target, name); ++ this.runnable = target; ++ } ++ ++ /** ++ * Creates a new {@code TestThread} object. ++ * ++ * @param target The object whose {@code run} method is called ++ */ ++ public TestThread(Runnable target) { ++ super(target); ++ this.runnable = target; ++ } ++ ++ /** ++ * Creates a new {@code TestThread} object. ++ * ++ * @param group The thread group ++ * @param target The object whose {@code run} method is called ++ * @param name The thread name ++ * @param stackSize Stack size ++ */ ++ public TestThread(ThreadGroup group, Runnable target, String name, ++ long stackSize) { ++ super(group, target, name, stackSize); ++ this.runnable = target; ++ } ++ ++ /** ++ * Creates a new {@code TestThread} object. ++ * ++ * @param group The thread group ++ * @param target The object whose {@code run} method is called ++ * @param name The thread name ++ */ ++ public TestThread(ThreadGroup group, Runnable target, String name) { ++ super(group, target, name); ++ this.runnable = target; ++ } ++ ++ /** ++ * Creates a new {@code TestThread} object. ++ * ++ * @param group The thread group ++ * @param target The object whose {@code run} method is called ++ */ ++ public TestThread(ThreadGroup group, Runnable target) { ++ super(group, target); ++ this.runnable = target; ++ } ++ ++ /** ++ * The thread executor. ++ */ ++ @Override ++ public void run() { ++ try { ++ super.run(); ++ } catch (Throwable t) { ++ uncaught = t; ++ } ++ } ++ ++ /** ++ * Returns exception caught during the execution. ++ * ++ * @return {@link Throwable} ++ */ ++ public Throwable getUncaught() { ++ return uncaught; ++ } ++ ++ /** ++ * Waits for {@link TestThread} to die ++ * and throws exception caught during the execution. ++ * ++ * @throws InterruptedException ++ * @throws Throwable ++ */ ++ public void joinAndThrow() throws InterruptedException, Throwable { ++ join(); ++ if (uncaught != null) { ++ throw uncaught; ++ } ++ } ++ ++ /** ++ * Waits during {@code timeout} for {@link TestThread} to die ++ * and throws exception caught during the execution. ++ * ++ * @param timeout The time to wait in milliseconds ++ * @throws InterruptedException ++ * @throws Throwable ++ */ ++ public void joinAndThrow(long timeout) throws InterruptedException, ++ Throwable { ++ join(timeout); ++ if (isAlive()) { ++ throw new TimeoutException(); ++ } ++ if (uncaught != null) { ++ throw uncaught; ++ } ++ } ++ ++ /** ++ * Waits for {@link TestThread} to die ++ * and returns exception caught during the execution. ++ * ++ * @return Exception caught during the execution ++ * @throws InterruptedException ++ */ ++ public Throwable joinAndReturn() throws InterruptedException { ++ join(); ++ if (uncaught != null) { ++ return uncaught; ++ } ++ return null; ++ } ++ ++ /** ++ * Waits during {@code timeout} for {@link TestThread} to die ++ * and returns exception caught during the execution. ++ * ++ * @param timeout The time to wait in milliseconds ++ * @return Exception caught during the execution ++ * @throws InterruptedException ++ */ ++ public Throwable joinAndReturn(long timeout) throws InterruptedException { ++ join(timeout); ++ if (isAlive()) { ++ return new TimeoutException(); ++ } ++ if (uncaught != null) { ++ return uncaught; ++ } ++ return null; ++ } ++ ++ /** ++ * Waits until {@link TestThread} is in the certain {@link State} ++ * and blocking on {@code object}. ++ * ++ * @param state The thread state ++ * @param object The object to block on ++ */ ++ public void waitUntilBlockingOnObject(Thread.State state, Object object) { ++ String want = object == null ? null : object.getClass().getName() + '@' ++ + Integer.toHexString(System.identityHashCode(object)); ++ ThreadMXBean tmx = ManagementFactory.getThreadMXBean(); ++ while (isAlive()) { ++ ThreadInfo ti = tmx.getThreadInfo(getId()); ++ if (ti.getThreadState() == state ++ && (want == null || want.equals(ti.getLockName()))) { ++ return; ++ } ++ try { ++ Thread.sleep(1); ++ } catch (InterruptedException e) { ++ } ++ } ++ } ++ ++ /** ++ * Waits until {@link TestThread} is in native. ++ */ ++ public void waitUntilInNative() { ++ ThreadMXBean tmx = ManagementFactory.getThreadMXBean(); ++ while (isAlive()) { ++ ThreadInfo ti = tmx.getThreadInfo(getId()); ++ if (ti.isInNative()) { ++ return; ++ } ++ try { ++ Thread.sleep(1); ++ } catch (InterruptedException e) { ++ } ++ } ++ } ++ ++} +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,232 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++package jdk.testlibrary; ++ ++import static jdk.testlibrary.Asserts.assertTrue; ++ ++import java.io.IOException; ++import java.net.InetAddress; ++import java.net.ServerSocket; ++import java.net.UnknownHostException; ++import java.util.ArrayList; ++import java.util.List; ++import java.util.Arrays; ++import java.util.Collections; ++import java.util.regex.Pattern; ++import java.util.regex.Matcher; ++ ++/** ++ * Common library for various test helper functions. ++ */ ++public final class Utils { ++ ++ /** ++ * Returns the sequence used by operating system to separate lines. ++ */ ++ public static final String NEW_LINE = System.getProperty("line.separator"); ++ ++ /** ++ * Returns the value of 'test.vm.opts'system property. ++ */ ++ public static final String VM_OPTIONS = System.getProperty("test.vm.opts", "").trim(); ++ ++ /** ++ * Returns the value of 'test.java.opts'system property. ++ */ ++ public static final String JAVA_OPTIONS = System.getProperty("test.java.opts", "").trim(); ++ ++ ++ private Utils() { ++ // Private constructor to prevent class instantiation ++ } ++ ++ /** ++ * Returns the list of VM options. ++ * ++ * @return List of VM options ++ */ ++ public static List<String> getVmOptions() { ++ return Arrays.asList(safeSplitString(VM_OPTIONS)); ++ } ++ ++ /** ++ * Returns the list of VM options with -J prefix. ++ * ++ * @return The list of VM options with -J prefix ++ */ ++ public static List<String> getForwardVmOptions() { ++ String[] opts = safeSplitString(VM_OPTIONS); ++ for (int i = 0; i < opts.length; i++) { ++ opts[i] = "-J" + opts[i]; ++ } ++ return Arrays.asList(opts); ++ } ++ ++ /** ++ * Returns the default JTReg arguments for a jvm running a test. ++ * This is the combination of JTReg arguments test.vm.opts and test.java.opts. ++ * @return An array of options, or an empty array if no opptions. ++ */ ++ public static String[] getTestJavaOpts() { ++ List<String> opts = new ArrayList<String>(); ++ Collections.addAll(opts, safeSplitString(VM_OPTIONS)); ++ Collections.addAll(opts, safeSplitString(JAVA_OPTIONS)); ++ return opts.toArray(new String[0]); ++ } ++ ++ /** ++ * Combines given arguments with default JTReg arguments for a jvm running a test. ++ * This is the combination of JTReg arguments test.vm.opts and test.java.opts ++ * @return The combination of JTReg test java options and user args. ++ */ ++ public static String[] addTestJavaOpts(String... userArgs) { ++ List<String> opts = new ArrayList<String>(); ++ Collections.addAll(opts, getTestJavaOpts()); ++ Collections.addAll(opts, userArgs); ++ return opts.toArray(new String[0]); ++ } ++ ++ /** ++ * Splits a string by white space. ++ * Works like String.split(), but returns an empty array ++ * if the string is null or empty. ++ */ ++ private static String[] safeSplitString(String s) { ++ if (s == null || s.trim().isEmpty()) { ++ return new String[] {}; ++ } ++ return s.trim().split("\\s+"); ++ } ++ ++ /** ++ * @return The full command line for the ProcessBuilder. ++ */ ++ public static String getCommandLine(ProcessBuilder pb) { ++ StringBuilder cmd = new StringBuilder(); ++ for (String s : pb.command()) { ++ cmd.append(s).append(" "); ++ } ++ return cmd.toString(); ++ } ++ ++ /** ++ * Returns the free port on the local host. ++ * The function will spin until a valid port number is found. ++ * ++ * @return The port number ++ * @throws InterruptedException if any thread has interrupted the current thread ++ * @throws IOException if an I/O error occurs when opening the socket ++ */ ++ public static int getFreePort() throws InterruptedException, IOException { ++ int port = -1; ++ ++ while (port <= 0) { ++ Thread.sleep(100); ++ ++ ServerSocket serverSocket = null; ++ try { ++ serverSocket = new ServerSocket(0); ++ port = serverSocket.getLocalPort(); ++ } finally { ++ serverSocket.close(); ++ } ++ } ++ ++ return port; ++ } ++ ++ /** ++ * Returns the name of the local host. ++ * ++ * @return The host name ++ * @throws UnknownHostException if IP address of a host could not be determined ++ */ ++ public static String getHostname() throws UnknownHostException { ++ InetAddress inetAddress = InetAddress.getLocalHost(); ++ String hostName = inetAddress.getHostName(); ++ ++ assertTrue((hostName != null && !hostName.isEmpty()), ++ "Cannot get hostname"); ++ ++ return hostName; ++ } ++ ++ /** ++ * Uses "jcmd -l" to search for a jvm pid. This function will wait ++ * forever (until jtreg timeout) for the pid to be found. ++ * @param key Regular expression to search for ++ * @return The found pid. ++ */ ++ public static int waitForJvmPid(String key) throws Throwable { ++ final long iterationSleepMillis = 250; ++ System.out.println("waitForJvmPid: Waiting for key '" + key + "'"); ++ System.out.flush(); ++ while (true) { ++ int pid = tryFindJvmPid(key); ++ if (pid >= 0) { ++ return pid; ++ } ++ Thread.sleep(iterationSleepMillis); ++ } ++ } ++ ++ /** ++ * Searches for a jvm pid in the output from "jcmd -l". ++ * ++ * Example output from jcmd is: ++ * 12498 sun.tools.jcmd.JCmd -l ++ * 12254 /tmp/jdk8/tl/jdk/JTwork/classes/com/sun/tools/attach/Application.jar ++ * ++ * @param key A regular expression to search for. ++ * @return The found pid, or -1 if Enot found. ++ * @throws Exception If multiple matching jvms are found. ++ */ ++ public static int tryFindJvmPid(String key) throws Throwable { ++ ProcessBuilder pb = null; ++ OutputAnalyzer output = null; ++ try { ++ JDKToolLauncher jcmdLauncher = JDKToolLauncher.create("jcmd"); ++ jcmdLauncher.addToolArg("-l"); ++ output = ProcessTools.executeProcess(jcmdLauncher.getCommand()); ++ output.shouldHaveExitValue(0); ++ ++ // Search for a line starting with numbers (pid), follwed by the key. ++ Pattern pattern = Pattern.compile("([0-9]+)\\s.*(" + key + ").*\\r?\\n"); ++ Matcher matcher = pattern.matcher(output.getStdout()); ++ ++ int pid = -1; ++ if (matcher.find()) { ++ pid = Integer.parseInt(matcher.group(1)); ++ System.out.println("findJvmPid.pid: " + pid); ++ if (matcher.find()) { ++ throw new Exception("Found multiple JVM pids for key: " + key); ++ } ++ } ++ return pid; ++ } catch (Throwable t) { ++ System.out.println(String.format("Utils.findJvmPid(%s) failed: %s", key, t)); ++ throw t; ++ } ++ } ++} +--- ./jdk/test/lib/testlibrary/jdk/testlibrary/XRun.java 1969-12-31 16:00:00.000000000 -0800 ++++ ./jdk/test/lib/testlibrary/jdk/testlibrary/XRun.java 2014-07-15 23:24:41.000000000 -0700 +@@ -0,0 +1,56 @@ ++/* ++ * Copyright (c) 2013, 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 if you need additional information or have any ++ * questions. ++ */ ++ ++package jdk.testlibrary; ++ ++/** ++ * This type serves no other purpose than to simply allow automatically running ++ * something in a thread, and have all exceptions propagated to ++ * RuntimeExceptions, which are thrown up to thread, which in turn should ++ * probably be a {@link TestThread} to they are stored. ++ */ ++public abstract class XRun implements Runnable { ++ ++ /** ++ * Invokes {@code xrun()} and throws all exceptions caught in it ++ * up to the thread. ++ */ ++ public final void run() { ++ try { ++ xrun(); ++ } catch (Error e) { ++ throw e; ++ } catch (RuntimeException e) { ++ throw e; ++ } catch (Throwable e) { ++ throw new RuntimeException(e); ++ } ++ } ++ ++ /** ++ * Override this method to implement what to run in the thread. ++ * ++ * @throws Throwable ++ */ ++ protected abstract void xrun() throws Throwable; ++} --- ./jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/sun/awt/datatransfer/DataFlavorComparatorTest.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -112991,7 +120448,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/sun/management/jdp/JdpTest.sh 2013-09-06 11:30:02.000000000 -0700 -+++ ./jdk/test/sun/management/jdp/JdpTest.sh 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/sun/management/jdp/JdpTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -84,15 +84,29 @@ ${TESTJAVA}/bin/java -server $* -cp ${_testclasses} ${testappname} >> ${_logname} 2>&1 & _last_pid=$! @@ -113032,7 +120489,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk _get_pid(){ --- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2013-09-06 11:30:02.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -45,37 +45,53 @@ # has to locate libjvm.so. Also $! is not reliable on some releases of MKS. #{ @@ -113113,7 +120570,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk # --- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2013-09-06 11:30:02.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2014-07-15 23:24:39.000000000 -0700 @@ -35,7 +35,7 @@ UMASK=`umask` @@ -113124,7 +120581,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FILESEP="/" DFILESEP=$FILESEP --- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2013-09-06 11:30:02.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -86,10 +86,12 @@ # on Windows 98. @@ -113143,7 +120600,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk JAVA=${TESTJAVA}/bin/java CLASSPATH=${TESTCLASSES} --- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2013-09-06 11:30:02.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -70,10 +70,12 @@ # security the password file. @@ -113162,7 +120619,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk # Create configuration file and dummy password file --- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2013-09-06 11:30:02.000000000 -0700 -+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -69,10 +69,12 @@ # security the password file. @@ -113181,7 +120638,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk # Create management and SSL configuration files --- ./jdk/test/sun/misc/IoTrace/IoTraceAgent.java 2013-09-06 11:30:03.000000000 -0700 -+++ ./jdk/test/sun/misc/IoTrace/IoTraceAgent.java 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/sun/misc/IoTrace/IoTraceAgent.java 2014-07-15 23:24:39.000000000 -0700 @@ -27,6 +27,7 @@ import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.ACC_STATIC; import static com.sun.xml.internal.ws.org.objectweb.asm.Opcodes.ACC_SUPER; @@ -113210,7 +120667,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk cw.visitEnd(); --- ./jdk/test/sun/misc/IoTrace/ioTraceTest.sh 2013-09-06 11:30:03.000000000 -0700 -+++ ./jdk/test/sun/misc/IoTrace/ioTraceTest.sh 2014-06-06 19:56:31.000000000 -0700 ++++ ./jdk/test/sun/misc/IoTrace/ioTraceTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -31,4 +31,4 @@ ${TESTJAVA}/bin/jar cfm iotraceagent.jar ${TESTSRC}/iotraceagent.mf IoTraceAgent.class IoTraceListener.class @@ -113218,7 +120675,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk -${TESTJAVA}/bin/java ${TESTVMOPTS} -javaagent:${TESTCLASSES}/iotraceagent.jar -cp ${TESTCLASSES} $* +${TESTJAVA}/bin/java -Xverify:all ${TESTVMOPTS} -javaagent:${TESTCLASSES}/iotraceagent.jar -cp ${TESTCLASSES} $* --- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2013-09-06 11:30:03.000000000 -0700 -+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -36,7 +36,7 @@ OS=`uname -s` @@ -113229,7 +120686,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/sun/net/www/MarkResetTest.sh 2013-09-06 11:30:03.000000000 -0700 -+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/net/www/MarkResetTest.sh 2014-07-15 23:24:39.000000000 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -113240,7 +120697,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2013-09-06 11:30:04.000000000 -0700 -+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2014-07-15 23:24:39.000000000 -0700 @@ -28,7 +28,7 @@ OS=`uname -s` @@ -113251,7 +120708,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2013-09-06 11:30:04.000000000 -0700 -+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2014-07-15 23:24:39.000000000 -0700 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -113262,7 +120719,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2013-09-06 11:30:04.000000000 -0700 -+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2014-07-15 23:24:39.000000000 -0700 @@ -31,7 +31,7 @@ OS=`uname -s` @@ -113273,7 +120730,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/sun/nio/ch/SelProvider.java 2013-09-06 11:30:04.000000000 -0700 -+++ ./jdk/test/sun/nio/ch/SelProvider.java 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/nio/ch/SelProvider.java 2014-07-15 23:24:39.000000000 -0700 @@ -39,7 +39,7 @@ expected = "sun.nio.ch.DevPollSelectorProvider"; } else if ("Linux".equals(osname)) { @@ -113284,7 +120741,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } else { return; --- ./jdk/test/sun/security/jgss/spnego/MechTokenMissing.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/sun/security/jgss/spnego/MechTokenMissing.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/jgss/spnego/MechTokenMissing.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -113340,7 +120797,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/sun/security/krb5/ParseCAPaths.java 2013-09-06 11:30:06.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/ParseCAPaths.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/ParseCAPaths.java 2014-07-15 23:24:39.000000000 -0700 @@ -22,7 +22,7 @@ */ /* @@ -113475,7 +120932,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } } --- ./jdk/test/sun/security/krb5/auto/BadKdc.java 2013-09-06 11:30:06.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/auto/BadKdc.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/auto/BadKdc.java 2014-07-15 23:24:39.000000000 -0700 @@ -39,7 +39,29 @@ // ^ kdc# ^ timeout static final Pattern re = Pattern.compile( @@ -113527,7 +120984,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } if (failed) sb.append('-'); --- ./jdk/test/sun/security/krb5/auto/BadKdc1.java 2013-09-06 11:30:06.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/auto/BadKdc1.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/auto/BadKdc1.java 2014-07-15 23:24:39.000000000 -0700 @@ -28,14 +28,21 @@ * @summary krb5 should not try to access unavailable kdc too often */ @@ -113553,7 +121010,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk "121212222222(32){1,2}1222(32){1,2}", // 1 2 // The above line means try kdc1 for 2 seconds then kdc1 --- ./jdk/test/sun/security/krb5/auto/BadKdc2.java 2013-09-06 11:30:06.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/auto/BadKdc2.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/auto/BadKdc2.java 2014-07-15 23:24:39.000000000 -0700 @@ -35,7 +35,12 @@ public static void main(String[] args) @@ -113569,7 +121026,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk "121212222222(32){1,2}11112121(32){1,2}", // 1 2 "11112121(32){1,2}11112121(32){1,2}", // 1 2 --- ./jdk/test/sun/security/krb5/auto/KDC.java 2013-09-06 11:30:07.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/auto/KDC.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/auto/KDC.java 2014-07-15 23:24:39.000000000 -0700 @@ -630,7 +630,7 @@ * @return the response * @throws java.lang.Exception for various errors @@ -113598,7 +121055,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk int[] eTypes = null; List<PAData> outPAs = new ArrayList<>(); --- ./jdk/test/sun/security/krb5/auto/LoginNoPass.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/sun/security/krb5/auto/LoginNoPass.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/auto/LoginNoPass.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved. @@ -113674,7 +121131,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/sun/security/krb5/auto/MaxRetries.java 2013-09-06 11:30:07.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/auto/MaxRetries.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/auto/MaxRetries.java 2014-07-15 23:24:39.000000000 -0700 @@ -54,7 +54,7 @@ test1(5000, 2); // 2 2 @@ -113709,7 +121166,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk // Add a bad KDC as the first candidate fw.write(" kdc = localhost:33333\n"); --- ./jdk/test/sun/security/krb5/auto/SaslGSS.java 2013-09-06 11:30:07.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/auto/SaslGSS.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/auto/SaslGSS.java 2014-07-15 23:24:39.000000000 -0700 @@ -23,7 +23,7 @@ /* @@ -113789,7 +121246,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } } --- ./jdk/test/sun/security/krb5/auto/TcpTimeout.java 2013-09-06 11:30:07.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/auto/TcpTimeout.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/auto/TcpTimeout.java 2014-07-15 23:24:39.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. @@ -113968,7 +121425,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } } --- ./jdk/test/sun/security/krb5/krb5-capaths.conf 2013-09-06 11:30:07.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/krb5-capaths.conf 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/krb5-capaths.conf 2014-07-15 23:24:39.000000000 -0700 @@ -1,6 +1,6 @@ [capaths] @@ -114101,7 +121558,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk A9.PRAGUE.XXX.CZ = { PRAGUE.XXX.CZ = . --- ./jdk/test/sun/security/krb5/runNameEquals.sh 2013-09-06 11:30:07.000000000 -0700 -+++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2014-07-15 23:24:39.000000000 -0700 @@ -48,15 +48,11 @@ # set platform-dependent variables OS=`uname -s` @@ -114120,7 +121577,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PATHSEP=";" FILESEP="/" --- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2013-09-06 11:30:07.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2014-07-15 23:24:39.000000000 -0700 @@ -131,6 +131,27 @@ ;; esac @@ -114150,7 +121607,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="\\" PS=";" --- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2013-09-06 11:30:07.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2014-07-15 23:24:39.000000000 -0700 @@ -93,6 +93,27 @@ ;; esac @@ -114180,7 +121637,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="\\" PS=";" --- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2013-09-06 11:30:08.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2014-07-15 23:24:39.000000000 -0700 @@ -50,19 +50,7 @@ OS=`uname -s` @@ -114203,7 +121660,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" CP="${FS}bin${FS}cp" --- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2013-09-06 11:30:08.000000000 -0700 -+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2014-07-15 23:24:39.000000000 -0700 @@ -51,19 +51,7 @@ OS=`uname -s` @@ -114226,7 +121683,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" CP="${FS}bin${FS}cp" --- ./jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java 2014-01-18 12:16:31.000000000 -0800 ++++ ./jdk/test/sun/security/pkcs11/tls/TestLeadingZeroesP11.java 2014-07-15 23:24:39.000000000 -0700 @@ -0,0 +1,410 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -114639,7 +122096,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk +} + --- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2013-09-06 11:30:09.000000000 -0700 -+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2014-07-15 23:24:39.000000000 -0700 @@ -44,11 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -114654,7 +122111,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FILESEP="/" ;; --- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2013-09-06 11:30:09.000000000 -0700 -+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2014-07-15 23:24:39.000000000 -0700 @@ -47,15 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -114673,7 +122130,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh 2013-09-06 11:30:10.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/EngineArgs/DebugReportsOneExtraByte.sh 2014-07-15 23:24:40.000000000 -0700 @@ -33,7 +33,7 @@ OS=`uname -s` @@ -114684,7 +122141,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java 2013-09-06 11:30:10.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLEngineImpl/SSLEngineDeadlock.java 2014-07-15 23:24:40.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved. @@ -114733,7 +122190,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk */ private static boolean resultOnce = true; --- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2013-09-06 11:30:11.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2014-07-15 23:24:40.000000000 -0700 @@ -42,7 +42,7 @@ OS=`uname -s` @@ -114744,7 +122201,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PATHSEP=":" ;; --- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2014-07-15 23:24:40.000000000 -0700 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -114755,7 +122212,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2014-07-15 23:24:40.000000000 -0700 @@ -32,7 +32,7 @@ HOSTNAME=`uname -n` OS=`uname -s` @@ -114766,7 +122223,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2014-07-15 23:24:40.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -114777,7 +122234,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/jarsigner/EntriesOrder.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/sun/security/tools/jarsigner/EntriesOrder.java 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/EntriesOrder.java 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,204 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -114984,7 +122441,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2014-07-15 23:24:40.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -114995,7 +122452,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/jarsigner/TimestampCheck.java 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/TimestampCheck.java 2014-01-18 12:16:31.000000000 -0800 ++++ ./jdk/test/sun/security/tools/jarsigner/TimestampCheck.java 2014-07-15 23:24:40.000000000 -0700 @@ -242,13 +242,13 @@ " -J-Djava.security.egd=file:/dev/./urandom" + " -debug -keystore " + TSKS + " -storepass changeit" + @@ -115048,7 +122505,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } } --- ./jdk/test/sun/security/tools/jarsigner/concise_jarsigner.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/concise_jarsigner.sh 2014-01-18 12:16:31.000000000 -0800 ++++ ./jdk/test/sun/security/tools/jarsigner/concise_jarsigner.sh 2014-07-15 23:24:40.000000000 -0700 @@ -136,7 +136,6 @@ # 16 and 32 already covered in the first part # ========================================================== @@ -115068,7 +122525,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk [ $? = 4 ] || exit $LINENO --- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2014-07-15 23:24:40.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115079,7 +122536,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/jarsigner/jvindex.sh 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/sun/security/tools/jarsigner/jvindex.sh 2014-06-06 19:56:32.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/jvindex.sh 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,76 @@ +# +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -115158,7 +122615,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + + --- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2014-07-15 23:24:40.000000000 -0700 @@ -42,7 +42,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115169,7 +122626,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/jarsigner/ts.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/jarsigner/ts.sh 2014-01-18 12:16:31.000000000 -0800 ++++ ./jdk/test/sun/security/tools/jarsigner/ts.sh 2014-07-15 23:24:40.000000000 -0700 @@ -22,7 +22,7 @@ # @@ -115189,7 +122646,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk rm tsks echo Nothing > A --- ./jdk/test/sun/security/tools/jarsigner/warnings.sh 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/sun/security/tools/jarsigner/warnings.sh 2014-01-18 12:16:31.000000000 -0800 ++++ ./jdk/test/sun/security/tools/jarsigner/warnings.sh 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,119 @@ +# +# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -115311,7 +122768,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + + --- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2014-07-15 23:24:40.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115322,7 +122779,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2014-07-15 23:24:40.000000000 -0700 @@ -47,15 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115341,7 +122798,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FILESEP="/" ;; --- ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/NoExtNPE.sh 2014-07-15 23:24:40.000000000 -0700 @@ -42,13 +42,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115358,7 +122815,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; CYGWIN* ) --- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2014-07-15 23:24:40.000000000 -0700 @@ -45,7 +45,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115369,7 +122826,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2014-07-15 23:24:40.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115380,7 +122837,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/keytool/autotest.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2014-07-15 23:24:40.000000000 -0700 @@ -72,6 +72,27 @@ ;; esac @@ -115410,7 +122867,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk echo "Will not run test on: ${OS}" exit 0; --- ./jdk/test/sun/security/tools/keytool/i18n.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2014-07-15 23:24:40.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115421,7 +122878,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/keytool/printssl.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2014-07-15 23:24:40.000000000 -0700 @@ -37,7 +37,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115432,7 +122889,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; CYGWIN* ) --- ./jdk/test/sun/security/tools/keytool/resource.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/resource.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/resource.sh 2014-07-15 23:24:40.000000000 -0700 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115443,7 +122900,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./jdk/test/sun/security/tools/keytool/standard.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/keytool/standard.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/keytool/standard.sh 2014-07-15 23:24:40.000000000 -0700 @@ -44,7 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115454,7 +122911,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; Windows_* ) --- ./jdk/test/sun/security/tools/policytool/Alias.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2014-07-15 23:24:40.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115465,7 +122922,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2014-07-15 23:24:40.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115476,7 +122933,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2014-07-15 23:24:40.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115487,7 +122944,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2014-07-15 23:24:40.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115498,7 +122955,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2014-07-15 23:24:40.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115509,7 +122966,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2014-07-15 23:24:40.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115520,7 +122977,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./jdk/test/sun/security/tools/policytool/i18n.sh 2013-09-06 11:30:12.000000000 -0700 -+++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2014-07-15 23:24:40.000000000 -0700 @@ -46,7 +46,7 @@ # set platform-dependent variables OS=`uname -s` @@ -115530,8 +122987,46 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk NULL=/dev/null PS=":" FS="/" +--- ./jdk/test/sun/text/resources/LocaleData 2013-09-06 11:30:13.000000000 -0700 ++++ ./jdk/test/sun/text/resources/LocaleData 2014-07-15 23:24:40.000000000 -0700 +@@ -11,7 +11,7 @@ + # bug #4052679 + LocaleNames/fr/fr=fran\u00e7ais + +-# bug #4055602, 4290801 ++# bug #4055602, 4290801, 8013836 + CurrencyNames/pt_BR/BRL=R$ + FormatData/pt_BR/NumberPatterns/0=#,##0.###;-#,##0.### + # FormatData/pt_BR/NumberPatterns/1=R$ #,##0.##;-R$ #,##0.## # Changed; see bug 4122840 +@@ -37,7 +37,7 @@ + FormatData/pt_BR/DayNames/0=Domingo + FormatData/pt_BR/DayNames/1=Segunda-feira + FormatData/pt_BR/DayNames/2=Ter\u00e7a-feira +-CalendarData/pt_BR/firstDayOfWeek=2 ++CalendarData/pt_BR/firstDayOfWeek=1 + CalendarData/pt_BR/minimalDaysInFirstWeek=1 + FormatData/pt_BR/MonthNames/0=Janeiro + FormatData/pt_BR/MonthNames/1=Fevereiro +--- ./jdk/test/sun/text/resources/LocaleDataTest.java 2013-09-06 11:30:13.000000000 -0700 ++++ ./jdk/test/sun/text/resources/LocaleDataTest.java 2014-07-15 23:24:40.000000000 -0700 +@@ -1,5 +1,5 @@ + /* +- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2007, 2014, 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 +@@ -34,7 +34,7 @@ + * 6509039 6609737 6610748 6645271 6507067 6873931 6450945 6645268 6646611 + * 6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787 + * 6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7189611 +- * 7171028 ++ * 7171028 8013836 + * @summary Verify locale data + * + */ --- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2014-07-15 23:24:40.000000000 -0700 @@ -0,0 +1,111 @@ +# +# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved. @@ -115645,7 +123140,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + else fail "unspecified test failure" +fi --- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2013-09-06 11:30:13.000000000 -0700 -+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2014-07-15 23:24:40.000000000 -0700 @@ -54,7 +54,7 @@ OS=`uname -s` @@ -115656,7 +123151,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; --- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2013-09-06 11:30:14.000000000 -0700 -+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2014-07-15 23:24:40.000000000 -0700 @@ -33,7 +33,7 @@ case `uname -s` in @@ -115667,7 +123162,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk N2A=$TESTJAVA/bin/native2ascii --- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2013-09-06 11:30:14.000000000 -0700 -+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2014-06-06 19:56:34.000000000 -0700 ++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2014-07-15 23:24:40.000000000 -0700 @@ -56,7 +56,7 @@ OS=`uname -s` @@ -115678,7 +123173,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; --- ./jdk/test/sun/util/resources/TimeZone/Bug6317929.java 2013-09-06 11:30:14.000000000 -0700 -+++ ./jdk/test/sun/util/resources/TimeZone/Bug6317929.java 2014-01-18 12:16:32.000000000 -0800 ++++ ./jdk/test/sun/util/resources/TimeZone/Bug6317929.java 2014-07-15 23:24:40.000000000 -0700 @@ -130,12 +130,12 @@ "(New South Wales)\""); tzLocale = locales2Test[1]; @@ -115769,7 +123264,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } } --- ./jdk/test/tools/launcher/I18NArgTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./jdk/test/tools/launcher/I18NArgTest.java 2014-06-06 19:56:33.000000000 -0700 ++++ ./jdk/test/tools/launcher/I18NArgTest.java 2014-07-15 23:24:38.000000000 -0700 @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -115883,7 +123378,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./langtools/.hgtags 2013-09-06 11:31:03.000000000 -0700 -+++ ./langtools/.hgtags 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/.hgtags 2014-07-15 23:24:07.000000000 -0700 @@ -123,6 +123,7 @@ 9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146 d34578643d1c6c752d4a6b5e79c6ab1b60850b4a jdk7u1-b01 @@ -115915,7 +123410,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk 28358b2489b2ca29c1a6b79f643204da8924a3d7 jdk7u25-b12 5ed8c453480063838b632c74f528924f529361a2 jdk7u25-b13 c6342ec6a12f7283e2a73a80a44dcdd3683e2e8b jdk7u25-b14 -@@ -343,3 +360,83 @@ +@@ -343,3 +360,104 @@ 765bea9bfcfc8c472df0a2daced5e576095f46ac jdk7u40-b42 988ece7b686564084770e99ca26746c45ffb933f jdk7u40-b43 a67dbf96bf86989d0392cc5b66e5d4139cbceec7 jdk7u40-b60 @@ -115968,6 +123463,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk +2a9f5c00ba46f895bc9d16a584bf7d80c1822268 jdk7u55-b02 +0479d260ac835eb3f0c7f3d7d15be0599b92a20a jdk7u55-b03 +a244cc40ae0b29028ff8503ee516cb5f9e3db6e3 jdk7u55-b04 ++25d63d986653d81522b01bbd2664083ae5fdc243 jdk7u65-b00 +25d63d986653d81522b01bbd2664083ae5fdc243 jdk7u55-b05 +76eeeaace70d38795eef5215f758493421cee0ac jdk7u55-b06 +08f7914d6aa947e73269b4e60110ed12573ffa28 jdk7u55-b07 @@ -115980,6 +123476,8 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk +96d55b4d88fea1d9f8227e70003210a6c10a1dba jdk7u55-b30 +c1964a222000b4884b992fdbaf8f62a45fb893c9 jdk7u55-b14 +4f6115ba266e5489b5e1968a28304f82be1f5641 jdk7u55-b31 ++ec8793f5aa4fb0aff4aa2f02f458fa6720f3ec6f jdk7u55-b32 ++13fed9e9f022e4a7f914c8410cbaa6f6564d4efd jdk7u55-b33 +849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00 +b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01 +954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02 @@ -115997,10 +123495,28 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk +a8b9c1929e50a9f3ae9ae1a23c06fa73a57afce3 jdk7u60-b14 +7568ebdada118da1d1a6addcf6316ffda21801fd jdk7u60-b15 +057caf9e0774e7c530c5710127f70c8d5f46deab jdk7u60-b16 -+b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b18 +b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b17 ++b7cc00c573c294b144317d44803758a291b3deda jdk7u60-b18 ++7effcbb8d1fd7ced194a294e29eea28bf552ac34 jdk7u65-b01 ++40aa95c8477aa0a3f090859570f5536afc9026b7 jdk7u60-b19 ++75b8c65f4c148baa4084022035b22de47df9426b jdk7u65-b02 ++16bb02dae837566f3c350c6313b09f6110dcba68 jdk7u65-b03 ++91677116552f743f3589f3d2ba255fa1079c0c48 jdk7u65-b04 ++8f585b94be8c83f89fc481cf010a129ef75cd31b jdk7u65-b05 ++c3a8556785e89b7868fc4ece666120dbf8c5c7a7 jdk7u65-b06 ++1978b6434c4f717ba1bd715f016ab99dff879857 jdk7u65-b07 ++684f0285b699d304d1efff487b550ff2e1679e98 jdk7u65-b08 ++2715f752385349274b43a1efaab5733bafc40557 jdk7u65-b09 ++98cac38ef1302939a37b85c0208a7969ba4cd8ad jdk7u65-b10 ++4c40603840a8ffbf5e30049b52ff336a9aca04c1 jdk7u65-b11 ++36b01ef633b2e70836b5914aa6924e81ff4d41ec jdk7u65-b12 ++5ba8a1ef0f82d341ede3ec2fdac7e012e42594c4 jdk7u65-b13 ++52769f410515f6a7fa66a93b24a1327fa6b6174a jdk7u65-b14 ++7f2891e4c6fcd9c0e31f50189a50c8de189d774f jdk7u65-b15 ++dea7e67840b68ae6752b37e69e242dae2765b878 jdk7u65-b16 ++15a051dfadb6a7d014f0d2739ccf0a63ade56313 jdk7u65-b17 --- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java 2013-09-06 11:31:06.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java 2014-04-19 01:27:04.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/ConfigurationImpl.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. @@ -116018,7 +123534,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk top = os[1]; } else if (opt.equals("-bottom")) { --- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java 2013-09-06 11:31:06.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlDocWriter.java 2014-07-15 23:24:05.000000000 -0700 @@ -181,12 +181,14 @@ String label, boolean strong, String stylename, String title, String target) { @@ -116038,7 +123554,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk if (title != null && title.length() != 0) { retlink.append(" title=\"" + title + "\""); --- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java 2013-09-06 11:31:06.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlTree.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. @@ -116111,7 +123627,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } --- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java 2013-09-06 11:31:06.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. @@ -116206,7 +123722,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk " allowSep = true;" + DocletConstants.NL + " } else if ('0' <= ch && ch <= '9'" + DocletConstants.NL + --- ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties 2013-09-06 11:31:06.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties 2014-07-15 23:24:05.000000000 -0700 @@ -25,7 +25,7 @@ doclet.Href_Enum_Title={0}\u5185\u306E\u5217\u6319\u578B doclet.Href_Type_Param_Title={0}\u5185\u306E\u578B\u30D1\u30E9\u30E1\u30FC\u30BF @@ -116250,7 +123766,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk doclet.Help_line_15=\u5404\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5316\u3055\u308C\u305F\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u304A\u3088\u3073\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u306F\u305D\u308C\u305E\u308C\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u304C\u3042\u308A\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u306F\u3001\u3069\u306E\u3088\u3046\u306A\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u3001\u30E1\u30BD\u30C3\u30C9\u3001\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304A\u3088\u3073\u30D5\u30A3\u30FC\u30EB\u30C9\u304C\u3001\u7279\u5B9A\u306E\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30D1\u30C3\u30B1\u30FC\u30B8\u306E\u4E00\u90E8\u3092\u4F7F\u7528\u3057\u3066\u3044\u308B\u304B\u304C\u8A18\u8FF0\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u30AF\u30E9\u30B9A\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9A\u306E\u5834\u5408\u3001\u305D\u306E\u300C\u4F7F\u7528\u300D\u30DA\u30FC\u30B8\u306B\u306F\u3001A\u306E\u30B5\u30D6\u30AF\u30E9\u30B9\u3001A\u3068\u3057\u3066\u5BA3\u8A00\u3055\u308C\u308B\u30D5\u30A3\u30FC\u30EB\u30C9\u3001A\u3092\u8FD4\u3059\u30E1\u30BD\u30C3\u30C9\u3068\u3001\u578BA\u3092\u6301\u3064\u30E1\u30BD\u30C3\u30C9\u304A\u3088\u3073\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u304C\u542B\u307E\u308C\u307E\u3059\u3002\u3053\u306E\u30DA\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u306B\u306F\u3001\u307E\u305A\u305D\u306E\u30D1\u30C3\u30B1\u30FC\u30B8\u3001\u30AF\u30E9\u30B9\u307E\u305F\u306F\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306B\u79FB\u52D5\u3057\u3001\u30CA\u30D3\u30B2\u30FC\u30B7\u30E7\u30F3\u30FB\u30D0\u30FC\u306E\u300C\u4F7F\u7528\u300D\u30EA\u30F3\u30AF\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002 doclet.Help_line_16=\u968E\u5C64\u30C4\u30EA\u30FC(\u30AF\u30E9\u30B9\u968E\u5C64) --- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties 2013-09-06 11:31:06.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets.properties 2014-07-15 23:24:05.000000000 -0700 @@ -182,25 +182,32 @@ doclet.0_and_1={0} and {1} @@ -116297,7 +123813,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk +doclet.enum_valueof_doc.throws_npe=\ + if the argument is null --- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties 2013-09-06 11:31:06.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties 2014-07-15 23:24:05.000000000 -0700 @@ -66,22 +66,22 @@ doclet.malformed_html_link_tag=<a> \u30BF\u30B0\u306E\u5F62\u5F0F\u304C\u4E0D\u6B63:\n"{0}" doclet.tag_misuse={0}\u30BF\u30B0\u306F{1}\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u3067\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002\u4F7F\u7528\u3067\u304D\u308B\u306E\u306F\u6B21\u306E\u30BF\u30A4\u30D7\u306E\u30C9\u30AD\u30E5\u30E1\u30F3\u30C8\u5185\u306E\u307F\u3067\u3059: {2}\u3002 @@ -116357,7 +123873,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + +doclet.enum_valueof_doc.throws_npe=\u5F15\u6570\u304Cnull\u306E\u5834\u5408 --- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties 2013-09-06 11:31:06.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_zh_CN.properties 2014-07-15 23:24:05.000000000 -0700 @@ -180,6 +180,16 @@ doclet.0_and_1={0}\u548C{1} @@ -116378,7 +123894,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + +doclet.enum_valueof_doc.throws_npe=\u5982\u679C\u53C2\u6570\u4E3A\u7A7A\u503C --- ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java 2013-09-06 11:31:07.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/Util.java 2014-07-15 23:24:05.000000000 -0700 @@ -852,16 +852,28 @@ for (int j = 0; j < methods.length; j++) { MethodDoc currentMethod = methods[j]; @@ -116416,7 +123932,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } } --- ./langtools/src/share/classes/com/sun/tools/javac/code/Type.java 2013-09-06 11:31:07.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/javac/code/Type.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/javac/code/Type.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -116436,7 +123952,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk */ public String toString() { --- ./langtools/src/share/classes/com/sun/tools/javac/code/Types.java 2013-09-06 11:31:07.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/javac/code/Types.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/javac/code/Types.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. @@ -116516,7 +124032,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk private List<Type> superClosure(Type t, Type s) { --- ./langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java 2013-09-06 11:31:07.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java 2013-12-01 11:13:46.000000000 -0800 ++++ ./langtools/src/share/classes/com/sun/tools/javac/parser/Scanner.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. @@ -116607,7 +124123,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } --- ./langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties 2013-09-06 11:31:07.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties 2014-01-18 12:16:11.000000000 -0800 ++++ ./langtools/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties 2014-07-15 23:24:05.000000000 -0700 @@ -555,19 +555,19 @@ # 0: name compiler.err.undef.label=\u30E9\u30D9\u30EB{0}\u306F\u672A\u5B9A\u7FA9\u3067\u3059 @@ -116642,7 +124158,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk # 0: symbol compiler.misc.diamond={0}<> --- ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties 2013-09-06 11:31:07.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties 2014-07-15 23:24:05.000000000 -0700 @@ -30,14 +30,14 @@ javac.opt.g.lines.vars.source=\u3044\u304F\u3064\u304B\u306E\u30C7\u30D0\u30C3\u30B0\u60C5\u5831\u306E\u307F\u3092\u751F\u6210\u3059\u308B javac.opt.nowarn=\u8B66\u544A\u3092\u767A\u751F\u3055\u305B\u306A\u3044 @@ -116672,7 +124188,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk javac.msg.io=\n\n\u5165\u51FA\u529B\u30A8\u30E9\u30FC\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\n\u8A73\u7D30\u306F\u6B21\u306E\u30B9\u30BF\u30C3\u30AF\u30FB\u30C8\u30EC\u30FC\u30B9\u3067\u8ABF\u67FB\u3057\u3066\u304F\u3060\u3055\u3044\u3002\n --- ./langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties 2013-09-06 11:31:08.000000000 -0700 -+++ ./langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/javah/resources/l10n_ja.properties 2014-07-15 23:24:05.000000000 -0700 @@ -55,8 +55,8 @@ main.opt.o=\ -o <file> \u51FA\u529B\u30D5\u30A1\u30A4\u30EB(-d\u304B-o\u306E\u3069\u3061\u3089\u304B\u4E00\u65B9\u3092\u4F7F\u7528\u3059\u308B) main.opt.d=\ -d <dir> \u51FA\u529B\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA @@ -116694,7 +124210,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk err.no.classes.specified=\u30AF\u30E9\u30B9\u304C\u6307\u5B9A\u3055\u308C\u3066\u3044\u307E\u305B\u3093 err.unknown.option=\u4E0D\u660E\u306A\u30AA\u30D7\u30B7\u30E7\u30F3: {0} --- ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_ja.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_ja.properties 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_ja.properties 2014-07-15 23:24:05.000000000 -0700 @@ -0,0 +1,63 @@ + +err.prefix=\u30A8\u30E9\u30FC: @@ -116760,7 +124276,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + +main.opt.sysinfo=\ -sysinfo \u51E6\u7406\u3057\u3066\u3044\u308B\u30AF\u30E9\u30B9\u306E\u30B7\u30B9\u30C6\u30E0\u60C5\u5831(\u30D1\u30B9\u3001\u30B5\u30A4\u30BA\u3001\u65E5\u4ED8\u3001MD5\u30CF\u30C3\u30B7\u30E5)\n \u3092\u8868\u793A\u3059\u308B --- ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties 1969-12-31 16:00:00.000000000 -0800 -+++ ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/src/share/classes/com/sun/tools/javap/resources/javap_zh_CN.properties 2014-07-15 23:24:05.000000000 -0700 @@ -0,0 +1,63 @@ + +err.prefix=\u9519\u8BEF: @@ -116826,7 +124342,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + +main.opt.sysinfo=\ -sysinfo \u663E\u793A\u6B63\u5728\u5904\u7406\u7684\u7C7B\u7684\n \u7CFB\u7EDF\u4FE1\u606F (\u8DEF\u5F84, \u5927\u5C0F, \u65E5\u671F, MD5 \u6563\u5217) --- ./langtools/test/Makefile 2013-09-06 11:31:11.000000000 -0700 -+++ ./langtools/test/Makefile 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/Makefile 2014-07-15 23:24:06.000000000 -0700 @@ -42,6 +42,14 @@ ARCH=i586 endif @@ -116863,7 +124379,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk # Root of all test results TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools --- ./langtools/test/com/sun/javadoc/testHref/TestHref.java 2013-09-06 11:31:12.000000000 -0700 -+++ ./langtools/test/com/sun/javadoc/testHref/TestHref.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/com/sun/javadoc/testHref/TestHref.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. @@ -116909,7 +124425,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk //Header does not link to the page itself. --- ./langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java 2013-09-06 11:31:13.000000000 -0700 -+++ ./langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved. @@ -116950,7 +124466,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk " allowSep = true;" + NL + " } else if ('0' <= ch && ch <= '9'" + NL + --- ./langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java 2013-09-06 11:31:13.000000000 -0700 -+++ ./langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/com/sun/javadoc/testLinkTaglet/TestLinkTaglet.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. @@ -116981,7 +124497,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk {BUG_ID + FS + "pkg" + FS + "C.InnerC.html", "Link to member in outer class: <a href=\"../pkg/C.html#MEMBER\"><code>C.MEMBER</code></a> <br/>\n" + --- ./langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java 2013-09-06 11:31:14.000000000 -0700 -+++ ./langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/com/sun/javadoc/testPrivateClasses/TestPrivateClasses.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. @@ -117008,7 +124524,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk "<a href=\"../pkg/PrivateParent.html\" title=\"class in pkg\">" + "PrivateParent</a></code></dd>"}, --- ./langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java 2014-04-19 01:27:04.000000000 -0700 ++++ ./langtools/test/com/sun/javadoc/testWindowTitle/TestWindowTitle.java 2014-07-15 23:24:05.000000000 -0700 @@ -0,0 +1,216 @@ +/* + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. @@ -117227,7 +124743,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java 2013-12-01 11:13:46.000000000 -0800 ++++ ./langtools/test/com/sun/javadoc/testWindowTitle/p1/C1.java 2014-07-15 23:24:05.000000000 -0700 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -117257,7 +124773,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk +public class C1 { +} --- ./langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java 2013-12-01 11:13:46.000000000 -0800 ++++ ./langtools/test/com/sun/javadoc/testWindowTitle/p2/C2.java 2014-07-15 23:24:05.000000000 -0700 @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. @@ -117287,7 +124803,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk +public class C2 { +} --- ./langtools/test/tools/javac/4846262/Test.sh 2013-09-06 11:31:16.000000000 -0700 -+++ ./langtools/test/tools/javac/4846262/Test.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/4846262/Test.sh 2014-07-15 23:24:05.000000000 -0700 @@ -44,7 +44,7 @@ # set platform-dependent variables OS=`uname -s` @@ -117298,7 +124814,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; CYGWIN* ) --- ./langtools/test/tools/javac/6302184/T6302184.sh 2013-09-06 11:31:16.000000000 -0700 -+++ ./langtools/test/tools/javac/6302184/T6302184.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/6302184/T6302184.sh 2014-07-15 23:24:05.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -117309,7 +124825,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; CYGWIN* ) --- ./langtools/test/tools/javac/6567415/T6567415.java 2013-09-06 11:31:16.000000000 -0700 -+++ ./langtools/test/tools/javac/6567415/T6567415.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/6567415/T6567415.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. @@ -117327,7 +124843,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk if (t.isAlive()) { throw new RuntimeException("Error: compilation is looping"); --- ./langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java 2013-12-01 11:13:46.000000000 -0800 ++++ ./langtools/test/tools/javac/7144981/IgnoreIgnorableCharactersInInput.java 2014-07-15 23:24:06.000000000 -0700 @@ -0,0 +1,92 @@ + +/* @@ -117422,7 +124938,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2013-09-06 11:31:17.000000000 -0700 -+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2014-07-15 23:24:05.000000000 -0700 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` @@ -117433,7 +124949,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; Windows* ) --- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2013-09-06 11:31:18.000000000 -0700 -+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2014-07-15 23:24:05.000000000 -0700 @@ -54,7 +54,7 @@ # set platform-dependent variables OS=`uname -s` @@ -117444,7 +124960,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./langtools/test/tools/javac/MissingInclude.sh 2013-09-06 11:31:19.000000000 -0700 -+++ ./langtools/test/tools/javac/MissingInclude.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/MissingInclude.sh 2014-07-15 23:24:06.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -117455,7 +124971,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; Windows* ) --- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2013-09-06 11:31:20.000000000 -0700 -+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2014-07-15 23:24:05.000000000 -0700 @@ -52,7 +52,7 @@ # set platform-dependent variables OS=`uname -s` @@ -117466,7 +124982,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./langtools/test/tools/javac/T5090006/compiler.sh 2013-09-06 11:31:20.000000000 -0700 -+++ ./langtools/test/tools/javac/T5090006/compiler.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/T5090006/compiler.sh 2014-07-15 23:24:05.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -117477,7 +124993,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; Windows* ) --- ./langtools/test/tools/javac/T8033294/RedundantWarningInIntersectionTest.java 1969-12-31 16:00:00.000000000 -0800 -+++ ./langtools/test/tools/javac/T8033294/RedundantWarningInIntersectionTest.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/T8033294/RedundantWarningInIntersectionTest.java 2014-07-15 23:24:06.000000000 -0700 @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. @@ -117538,7 +125054,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } +} --- ./langtools/test/tools/javac/api/6406133/T6406133.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6406133/T6406133.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6406133/T6406133.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. @@ -117556,7 +125072,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk import javax.tools.*; --- ./langtools/test/tools/javac/api/6410643/T6410643.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6410643/T6410643.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6410643/T6410643.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117574,7 +125090,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk import javax.tools.JavaFileObject; --- ./langtools/test/tools/javac/api/6411310/T6411310.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6411310/T6411310.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6411310/T6411310.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117591,7 +125107,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6411310 */ --- ./langtools/test/tools/javac/api/6411333/T6411333.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6411333/T6411333.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6411333/T6411333.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117608,7 +125124,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6411333 */ --- ./langtools/test/tools/javac/api/6412656/T6412656.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6412656/T6412656.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6412656/T6412656.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117626,7 +125142,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk import java.util.Set; --- ./langtools/test/tools/javac/api/6415780/T6415780.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6415780/T6415780.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6415780/T6415780.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. @@ -117644,7 +125160,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk import static javax.tools.StandardLocation.CLASS_PATH; --- ./langtools/test/tools/javac/api/6418694/T6418694.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6418694/T6418694.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6418694/T6418694.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117661,7 +125177,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6418694 */ --- ./langtools/test/tools/javac/api/6421111/T6421111.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6421111/T6421111.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6421111/T6421111.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. @@ -117678,7 +125194,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6421111 */ --- ./langtools/test/tools/javac/api/6421756/T6421756.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6421756/T6421756.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6421756/T6421756.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117695,7 +125211,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6421756 */ --- ./langtools/test/tools/javac/api/6422215/T6422215.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6422215/T6422215.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6422215/T6422215.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117713,7 +125229,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk import java.io.File; --- ./langtools/test/tools/javac/api/6422327/T6422327.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6422327/T6422327.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6422327/T6422327.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117731,7 +125247,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk import java.io.File; --- ./langtools/test/tools/javac/api/6423003/T6423003.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6423003/T6423003.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6423003/T6423003.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117748,7 +125264,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6423003 */ --- ./langtools/test/tools/javac/api/6431257/T6431257.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6431257/T6431257.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6431257/T6431257.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved. @@ -117765,7 +125281,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6431257 foo.bar.baz foo/bar/baz */ --- ./langtools/test/tools/javac/api/6437349/T6437349.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6437349/T6437349.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6437349/T6437349.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117782,7 +125298,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6437349 */ --- ./langtools/test/tools/javac/api/6437999/T6437999.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6437999/T6437999.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6437999/T6437999.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117799,7 +125315,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6437999 */ --- ./langtools/test/tools/javac/api/6440333/T6440333.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6440333/T6440333.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6440333/T6440333.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved. @@ -117816,7 +125332,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6440333 */ --- ./langtools/test/tools/javac/api/6440528/T6440528.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6440528/T6440528.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6440528/T6440528.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117833,7 +125349,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6440528 */ --- ./langtools/test/tools/javac/api/6468404/T6468404.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6468404/T6468404.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6468404/T6468404.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. @@ -117850,7 +125366,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main T6468404 */ --- ./langtools/test/tools/javac/api/6731573/T6731573.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6731573/T6731573.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6731573/T6731573.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. @@ -117868,7 +125384,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk import java.io.*; --- ./langtools/test/tools/javac/api/6733837/T6733837.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/6733837/T6733837.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/6733837/T6733837.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. @@ -117886,7 +125402,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk import java.io.StringWriter; --- ./langtools/test/tools/javac/api/TestJavacTaskScanner.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/TestJavacTaskScanner.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/TestJavacTaskScanner.java 2014-07-15 23:24:05.000000000 -0700 @@ -27,6 +27,7 @@ * @summary Additional functionality test of task and JSR 269 * @author Peter von der Ah\u00e9 @@ -117905,7 +125421,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk } catch (IOException e) { throw new AssertionError(e); --- ./langtools/test/tools/javac/api/guide/Test.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/guide/Test.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/guide/Test.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117922,7 +125438,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk * @run main Test */ --- ./langtools/test/tools/javac/api/lib/ToolTester.java 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/api/lib/ToolTester.java 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/api/lib/ToolTester.java 2014-07-15 23:24:05.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. @@ -117987,7 +125503,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk + } } --- ./langtools/test/tools/javac/apt.sh 2013-09-06 11:31:23.000000000 -0700 -+++ ./langtools/test/tools/javac/apt.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/apt.sh 2014-07-15 23:24:06.000000000 -0700 @@ -38,7 +38,7 @@ # set platform-dependent variables OS=`uname -s` @@ -117998,7 +125514,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2013-09-06 11:31:24.000000000 -0700 -+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2014-07-15 23:24:05.000000000 -0700 @@ -47,7 +47,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118009,7 +125525,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2013-09-06 11:31:28.000000000 -0700 -+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2014-07-15 23:24:05.000000000 -0700 @@ -48,7 +48,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118020,7 +125536,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; CYGWIN* ) --- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2013-09-06 11:31:33.000000000 -0700 -+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2014-07-15 23:24:05.000000000 -0700 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118031,7 +125547,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; Windows* ) --- ./langtools/test/tools/javac/javazip/Test.sh 2013-09-06 11:31:33.000000000 -0700 -+++ ./langtools/test/tools/javac/javazip/Test.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/javazip/Test.sh 2014-07-15 23:24:05.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118042,7 +125558,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk SCR=`pwd` ;; --- ./langtools/test/tools/javac/links/links.sh 2013-09-06 11:31:33.000000000 -0700 -+++ ./langtools/test/tools/javac/links/links.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/links/links.sh 2014-07-15 23:24:05.000000000 -0700 @@ -53,7 +53,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118053,7 +125569,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk PS=":" FS="/" --- ./langtools/test/tools/javac/newlines/Newlines.sh 2013-09-06 11:31:34.000000000 -0700 -+++ ./langtools/test/tools/javac/newlines/Newlines.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/newlines/Newlines.sh 2014-07-15 23:24:06.000000000 -0700 @@ -50,7 +50,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118064,7 +125580,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; Windows* ) --- ./langtools/test/tools/javac/stackmap/T4955930.sh 2013-09-06 11:31:36.000000000 -0700 -+++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2014-07-15 23:24:06.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118075,7 +125591,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; Windows_95 | Windows_98 | Windows_NT ) --- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2013-09-06 11:31:36.000000000 -0700 -+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2014-07-15 23:24:06.000000000 -0700 @@ -55,7 +55,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118086,7 +125602,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk then ENV="env LANG=en_US.UTF-8" --- ./langtools/test/tools/javah/6257087/foo.sh 2013-09-06 11:31:38.000000000 -0700 -+++ ./langtools/test/tools/javah/6257087/foo.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javah/6257087/foo.sh 2014-07-15 23:24:06.000000000 -0700 @@ -41,7 +41,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118097,7 +125613,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./langtools/test/tools/javah/ConstMacroTest.sh 2013-09-06 11:31:38.000000000 -0700 -+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javah/ConstMacroTest.sh 2014-07-15 23:24:06.000000000 -0700 @@ -56,7 +56,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118108,7 +125624,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./langtools/test/tools/javah/MissingParamClassTest.sh 2013-09-06 11:31:38.000000000 -0700 -+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2014-07-15 23:24:06.000000000 -0700 @@ -58,7 +58,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118119,7 +125635,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./langtools/test/tools/javah/ReadOldClass.sh 2013-09-06 11:31:38.000000000 -0700 -+++ ./langtools/test/tools/javah/ReadOldClass.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javah/ReadOldClass.sh 2014-07-15 23:24:06.000000000 -0700 @@ -43,7 +43,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118130,7 +125646,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk FS="/" ;; --- ./langtools/test/tools/javap/pathsep.sh 2013-09-06 11:31:39.000000000 -0700 -+++ ./langtools/test/tools/javap/pathsep.sh 2014-06-06 19:56:17.000000000 -0700 ++++ ./langtools/test/tools/javap/pathsep.sh 2014-07-15 23:24:06.000000000 -0700 @@ -40,7 +40,7 @@ # set platform-dependent variables OS=`uname -s` @@ -118141,7 +125657,7 @@ Files openjdk/jdk/test/javax/imageio/plugins/jpeg/truncated.jpg and bsd-port/jdk ;; Windows* ) --- ./make/scripts/webrev.ksh 2013-09-06 11:20:33.000000000 -0700 -+++ ./make/scripts/webrev.ksh 2014-06-06 19:56:10.000000000 -0700 ++++ ./make/scripts/webrev.ksh 2014-07-15 23:24:59.000000000 -0700 @@ -2695,11 +2695,11 @@ rm -f $WDIR/$DIR/$F.html diff --git a/java/openjdk7/files/patch-src-solaris-native-sun-nio-ch-NativeThread.c b/java/openjdk7/files/patch-src-solaris-native-sun-nio-ch-NativeThread.c deleted file mode 100644 index 93216af25d73..000000000000 --- a/java/openjdk7/files/patch-src-solaris-native-sun-nio-ch-NativeThread.c +++ /dev/null @@ -1,51 +0,0 @@ ---- jdk/src/solaris/native/sun/nio/ch/NativeThread.c -+++ jdk/src/solaris/native/sun/nio/ch/NativeThread.c -@@ -33,12 +33,20 @@ - #include "nio_util.h" - - --#ifdef __linux__ -+#if defined(__linux__) || defined(_ALLBSD_SOURCE) -+#if defined(__linux__) - #include <pthread.h> - #include <sys/signal.h> - - /* Also defined in src/solaris/native/java/net/linux_close.c */ - #define INTERRUPT_SIGNAL (__SIGRTMAX - 2) -+#else -+#include <pthread.h> -+#include <signal.h> -+ -+/* Also defined in src/solaris/native/java/net/bsd_close.c */ -+#define INTERRUPT_SIGNAL SIGIO -+#endif - - static void - nullHandler(int sig) -@@ -51,7 +59,7 @@ - JNIEXPORT void JNICALL - Java_sun_nio_ch_NativeThread_init(JNIEnv *env, jclass cl) - { --#ifdef __linux__ -+#if defined(__linux__) || defined(_ALLBSD_SOURCE) - - /* Install the null handler for INTERRUPT_SIGNAL. This might overwrite the - * handler previously installed by java/net/linux_close.c, but that's okay -@@ -74,7 +82,7 @@ - JNIEXPORT jlong JNICALL - Java_sun_nio_ch_NativeThread_current(JNIEnv *env, jclass cl) - { --#ifdef __linux__ -+#if defined(__linux__) || defined(_ALLBSD_SOURCE) - return (long)pthread_self(); - #else - return -1; -@@ -84,7 +92,7 @@ - JNIEXPORT void JNICALL - Java_sun_nio_ch_NativeThread_signal(JNIEnv *env, jclass cl, jlong thread) - { --#ifdef __linux__ -+#if defined(__linux__) || defined(_ALLBSD_SOURCE) - if (pthread_kill((pthread_t)thread, INTERRUPT_SIGNAL)) - JNU_ThrowIOExceptionWithLastError(env, "Thread signal failed"); - #endif |