Mercurial > hg > icedtea7
changeset 2759:79f4941c15fd icedtea-2.6.0pre12
Bump to icedtea-2.6pre12 and u80b03.
PR2094, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
S6458027: Disabling IPv6 on a specific network interface causes problems
S6461635: [TESTBUG] BasicTests.sh test fails intermittently
S6931564: Incorrect display name of Locale for south africa
S7017962: Obsolete link is used in URL class level spec
S7028073: The currency symbol for Peru is wrong
S7033533: realSync() doesn't work with Xfce
S7077119: remove past transition dates from CurrencyData.properties file
S7085757: Currency Data: ISO 4217 Amendment 152
S7145454: JVM wide monitor lock in Currency.getInstance(String)
S7156459: Remove unnecessary get() from Currency.getInstance()
S7180038: regression test failure, SSLEngineBadBufferArrayAccess.java
S7195759: ISO 4217 Amendment 154
S8004488: wrong permissions checked in krb5
S8006748: getISO3Country() returns wrong value
S8008328: [partfait] Null pointer defererence in hotspot/src/cpu/x86/vm/frame_x86.inline.hpp
S8014254: Selector in HttpServer introduces a 1000 ms delay when using KeepAlive
S8016579: (process) IOException thrown by ProcessBuilder.start() method is incorrectly encoded
S8021121: ISO 4217 Amendment Number 156
S8026303: CMS: JVM intermittently crashes with "FreeList of size 258 violates Conservation Principle" assert
S8027695: There should be a space before % sign in Swedish locale
S8028484: [TEST_BUG][macosx] closed/java/awt/MouseInfo/JContainerMousePositionTest fails
S8030976: Untaken paths should be more vigorously pruned at highest optimization level
S8031566: regression test failure, SSLEngineBadBufferArrayAccess.java
S8033627: UTC+02:00 time zones are not detected correctly on Windows
S8033699: Incorrect radio button behavior
S8038919: Requesting focus to a modeless dialog doesn't work on Safari
S8038966: JAX-WS handles wrongly xsd:any arguments for Web services
S8041572: [macosx] huge native memory leak in AWTWindow.m
S8041979: sun/jvmstat/monitor/MonitoredVm/CR6672135.java failing on all platforms
S8041980: (hotspot) sun/jvmstat/monitor/MonitoredVm/CR6672135.java failing on all platforms
S8041984: CompilerThread seems to occupy all CPU in a very rare situation
S8046275: Fastdebug build failing on jdk9/hs/ control jobs after pulling some hs-comp changes
S8046588: test for SO_FLOW_SLA availability does not check for EACCESS
S8047187: Test jdk/net/Sockets/Test.java fails to compile after fix JDK-8046588
S8050022: linux-sparcv9: assert(SharedSkipVerify || obj->is_oop()) failed: sanity check
S8051614: smartcardio TCK tests fail due to lack of 'reset' permission
S8051857: OperationTimedOut exception inside from XToolkit.syncNativeQueue call
S8052406: SSLv2Hello protocol may be filter out unexpectedly
S8055222: Currency update needed for ISO 4217 Amendment #159
S8056026: Debug security logging should print Provider used for each crypto operation
S8056914: Right Click Menu for Paste not showing after upgrading to java 7
S8057530: (process) Runtime.exec throws garbled message in jp locale
S8058120: Rendering / caret errors with HTMLDocument
S8058473: "Comparison method violates its general contract" when using Clipboard
S8058927: ATG throws ClassNotFoundException
S8058932: java/net/InetAddress/IPv4Formats.java failed because hello.foo.bar does exist
S8059206: (tz) Support tzdata2014i
S8059299: assert(adr_type != NULL) failed: expecting TypeKlassPtr
S8059563: (proxy) sun.misc.ProxyGenerator.generateProxyClass should create intermediate directories
S8060006: No Russian time zones mapping for Windows
S8060169: Update the Crash Reporting URL in the Java crash log
S8062744: jdk.net.Sockets.setOption/getOption does not support IP_TOS
2014-12-04 Andrew John Hughes <gnu.andrew@member.fsf.org>
* Makefile.am:
(BUILD_VERSION): Bump to b03.
(CORBA_CHANGESET): Update to icedtea-2.6pre12.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
(ICEDTEA_BOOT_PATCHES): Add workaround for bug
in parsing end-of-year dates (Classpath PR64174).
* NEWS: Updated.
* acinclude.m4:
(IT_PR64174_CHECK): Detect if the boot JDK suffers
from PR64174 and apply the patch if so.
* configure.ac: Bump to 2.6.0pre12. Call IT_PR64174_CHECK.
* hotspot.map.in: Update to icedtea-2.6.0pre12.
* patches/boot/ecj-diamond.patch: Regenerated.
Add new case in java.util.Currency.
* patches/boot/pr64174.patch: Drop the Latvian
Euro changeover date, which is in the past anyway,
and move Lithuania's two hours forward so it enters
2015 and avoids the bug.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Thu, 04 Dec 2014 19:46:52 +0000 |
| parents | b7d5d8a6747b |
| children | 0ee0b4813076 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 configure.ac hotspot.map.in patches/boot/ecj-diamond.patch patches/boot/pr64174.patch |
| diffstat | 8 files changed, 813 insertions(+), 640 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Nov 12 21:21:51 2014 +0000 +++ b/ChangeLog Thu Dec 04 19:46:52 2014 +0000 @@ -1,3 +1,34 @@ +2014-12-04 Andrew John Hughes <gnu.andrew@member.fsf.org> + + * Makefile.am: + (BUILD_VERSION): Bump to b03. + (CORBA_CHANGESET): Update to icedtea-2.6pre12. + (JAXP_CHANGESET): Likewise. + (JAXWS_CHANGESET): Likewise. + (JDK_CHANGESET): Likewise. + (LANGTOOLS_CHANGESET): Likewise. + (OPENJDK_CHANGESET): Likewise. + (CORBA_SHA256SUM): Likewise. + (JAXP_SHA256SUM): Likewise. + (JAXWS_SHA256SUM): Likewise. + (JDK_SHA256SUM): Likewise. + (LANGTOOLS_SHA256SUM): Likewise. + (OPENJDK_SHA256SUM): Likewise. + (ICEDTEA_BOOT_PATCHES): Add workaround for bug + in parsing end-of-year dates (Classpath PR64174). + * NEWS: Updated. + * acinclude.m4: + (IT_PR64174_CHECK): Detect if the boot JDK suffers + from PR64174 and apply the patch if so. + * configure.ac: Bump to 2.6.0pre12. Call IT_PR64174_CHECK. + * hotspot.map.in: Update to icedtea-2.6.0pre12. + * patches/boot/ecj-diamond.patch: Regenerated. + Add new case in java.util.Currency. + * patches/boot/pr64174.patch: Drop the Latvian + Euro changeover date, which is in the past anyway, + and move Lithuania's two hours forward so it enters + 2015 and avoids the bug. + 2014-11-11 Andrew John Hughes <gnu.andrew@member.fsf.org> Merge AArch64 port into mainline IcedTea7.
--- a/Makefile.am Wed Nov 12 21:21:51 2014 +0000 +++ b/Makefile.am Thu Dec 04 19:46:52 2014 +0000 @@ -1,22 +1,22 @@ # Dependencies JDK_UPDATE_VERSION = 80 -BUILD_VERSION = b02 +BUILD_VERSION = b03 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = c11c54a2675c -JAXP_CHANGESET = 79d217da0a7a -JAXWS_CHANGESET = 2823343ab244 -JDK_CHANGESET = 8a445d1b5af5 -LANGTOOLS_CHANGESET = 510234036e06 -OPENJDK_CHANGESET = 05e485acec14 +CORBA_CHANGESET = f2ef4247a9a4 +JAXP_CHANGESET = 1edb9d1d6451 +JAXWS_CHANGESET = d4724872ee06 +JDK_CHANGESET = 3620a98d0295 +LANGTOOLS_CHANGESET = 987d772301e9 +OPENJDK_CHANGESET = b70554883dbd -CORBA_SHA256SUM = 34423a2478ce65ce73c0dc55f947323365b1471252d2e3b6c785adb54042c21b -JAXP_SHA256SUM = 1d8bcb0612d2d3b6079d4bb84d656aacafe5f3061ceadc2d7e9814270c77ac53 -JAXWS_SHA256SUM = 33a5c2f6dc84c09d40a4fe6d6beaff4f1bfecb82bb69f9730f03d50e9af782c0 -JDK_SHA256SUM = 0836221bc6aa763ff8814d15a15f0ed2410e727cf8461e609db82a535cdc2027 -LANGTOOLS_SHA256SUM = cc85aa73a186475590c54d980dfd04ae37665155ea07ee6f1418e4d2e55429d0 -OPENJDK_SHA256SUM = 56d5f39698e91571c8155767577126b4106cf67fad0a6743918063970c208b93 +CORBA_SHA256SUM = e762b74255e0ed145bab11686fd4c87a508b010573f8a4278cb3fbde439c8e4a +JAXP_SHA256SUM = fb637799df8618b3bf5d2a4d0fd63bca0ad9827368065f07786bb027052f0e20 +JAXWS_SHA256SUM = 2555f2dad99bf27047097949633e5f1408e06dea2d75d2ed392e128f423f53a5 +JDK_SHA256SUM = 145f447141b491e62e9f51a21db80dd17e9a15f1ff2e214ad2ef6fc21e605420 +LANGTOOLS_SHA256SUM = ff320d9bca2ddbb1f74d623c801d21fb2f1ab0d2f5eb6e19f9b6a5fefd3f9942 +OPENJDK_SHA256SUM = 98dd8ba4936187937f30d865fff0827118ac3612274ef494f32b3441613ee944 DROP_URL = http://icedtea.classpath.org/download/drops @@ -390,6 +390,13 @@ ICEDTEA_BOOT_PATCHES += patches/boot/use_target_6_for_bootstrap_classes.patch endif +# If date parsing bug is present, move Lithuania EUR transition date +# two hours forward into 1st of January, 2015 and drop Latvia transition +# date as it's already in the past. +if CP64174 +ICEDTEA_BOOT_PATCHES += patches/boot/pr64174.patch +endif + ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES) # OpenJDK build environment.
--- a/NEWS Wed Nov 12 21:21:51 2014 +0000 +++ b/NEWS Thu Dec 04 19:46:52 2014 +0000 @@ -18,19 +18,27 @@ - S4792059: test/java/io/pathNames/GeneralSolaris.java fails on symbolic links - S4991647: PNGMetadata.getAsTree() sets bitDepth to invalid value - S5036554: unmarshal error on CORBA alias type in CORBA any + - S6458027: Disabling IPv6 on a specific network interface causes problems + - S6461635: [TESTBUG] BasicTests.sh test fails intermittently - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in exec - S6642881: Improve performance of Class.getClassLoader() - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer sign extension on 32-bit systems - S6883953: java -client -XX:ValueMapInitialSize=0 crashes + - S6931564: Incorrect display name of Locale for south africa - S6984762: Invalid close of file descriptor '-1' in findZoneinfoFile - S6993873: java/awt/Focus/FocusOwnerFrameOnClick/FocusOwnerFrameOnClick.java test indicates ".a frame wasn't focused on click" jdk7 issue on linux - S7010989: Duplicate closure of file descriptors leads to unexpected and incorrect closure of sockets + - S7017962: Obsolete link is used in URL class level spec + - S7028073: The currency symbol for Peru is wrong + - S7033533: realSync() doesn't work with Xfce - S7036518: TEST_BUG: add cygwin support to test/java/nio/charset/coders/CheckSJISMappingProp.sh - S7047033: (smartcardio) Card.disconnect(boolean reset) does not reset when reset is true - S7052170: javadoc -charset option generates wrong meta tag - S7058832: com/sun/net/httpserver/bugs/B6373555.java failing intermittently - S7076487: (sctp) SCTP API classes does not exist in JDK for Mac + - S7077119: remove past transition dates from CurrencyData.properties file - S7084032: test/java/net/Inet6Address/B6558853.java fails on Windows XP/2003 if IPv6 + - S7085757: Currency Data: ISO 4217 Amendment 152 - S7087021: TEST: com/sun/crypto/provider/Mac/MacClone.java failed on Solaris sparc 5.10 - S7090324: gclog rotation via external tool - S7095856: OutputStreamHook doesn't handle null values @@ -38,22 +46,29 @@ - S7121403: [TESTBUG] runtime/7051189/Xchecksig.sh fails on 64bit solaris - S7130140: using horizontal scroll button on mouse causes a message to be printed on stdout - S7142035: assert in j.l.instrument agents during shutdown when daemon thread is running + - S7145454: JVM wide monitor lock in Currency.getInstance(String) - S7152892: some jtreg tests fail with permission denied - S7153157: ClassValue.get does not return if computeValue calls remove + - S7156459: Remove unnecessary get() from Currency.getInstance() - S7158636: InterfaceAddress.getBroadcast() returns invalid broadcast address on WLAN - S7160604: Using non-opaque windows - popups are initially not painted correctly - S7161320: TEST_BUG: java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java fails (Invalid key code) - S7164841: Improvements to the GC log file rotation - S7169142: CookieHandler does not work with localhost - S7172865: PropertyDescriptor fails to work with setter method name if setter is non-void + - S7180038: regression test failure, SSLEngineBadBufferArrayAccess.java - S7185456: (ann) Optimize Annotation handling in java/sun.reflect.* code for small number of annotations - S7195480: javax.smartcardio does not detect cards on Mac OS X + - S7195759: ISO 4217 Amendment 154 - S7199674: (props) user.home property does not return an accessible location in sandboxed environment [macosx] - S8001105: findVirtual of Object[].clone produces internal error - S8001472: api/java_awt/Window/indexTGF_* tests fail because expected colors aren't equal - S8002148: [TEST_BUG] The four lines printed are not the bold typeface. + - S8004488: wrong permissions checked in krb5 - S8005232: (JEP-149) Class Instance size reduction - S8006023: Embedded Builds fail management test because of requirement for UsePerfData being enabled. + - S8006748: getISO3Country() returns wrong value + - S8008328: [partfait] Null pointer defererence in hotspot/src/cpu/x86/vm/frame_x86.inline.hpp - S8009258: TEST_BUG:java/io/pathNames/GeneralWin32.java fails intermittently - S8010738: G1: Output for full GCs with +PrintGCDetails should contain perm gen/meta data size change info - S8011646: SEGV in compiled code with loop predication @@ -62,15 +77,18 @@ - S8012625: Incorrect handling of HTTP/1.1 " Expect: 100-continue " in HttpURLConnection - S8012941: JSR 292: too deep inlining might crash compiler because of stack overflow - S8013098: [macosx] localized aqua_xx.properties are not included in rt.jar + - S8014254: Selector in HttpServer introduces a 1000 ms delay when using KeepAlive - S8015421: NegativeArraySizeException occurs in ChunkedOutputStream() with Integer.MAX_VALUE - S8015586: [macosx] Test closed/java/awt/print/PrinterJob/PrintToDir.java fails on MacOSX - S8015628: Test Failure in closed/java/io/pathNames/GeneralSolaris.java - S8016545: java.beans.XMLEncoder.writeObject output is wrong + - S8016579: (process) IOException thrown by ProcessBuilder.start() method is incorrectly encoded - S8017212: File.createTempFile requires unnecessary "read" permission - S8019324: assert(_f2 == 0 || _f2 == f2) failed: illegal field change - S8019623: Lack of synchronization in AppContext.getAppContext() - S8019800: Test sun/tools/jcmd/jcmd-f.sh failing after JDK-8017011 - S8019834: InetAddress.getByName hangs for bad IPv6 literals + - S8021121: ISO 4217 Amendment Number 156 - S8021372: NetworkInterface.getNetworkInterfaces() returns duplicate hardware address - S8021804: Certpath validation fails if validity period of root cert does not include validity period of intermediate cert - S8022070: Compilation error in stubGenerator_sparc.cpp with some compilers @@ -86,14 +104,17 @@ - S8025644: java/util/stream/test/org/openjdk/tests/java/util/stream/ToArrayOpTest.java fails with TestData): failure java.lang.AssertionError: expected [true] but found [false] - S8025710: Proxied HTTPS connections reused by HttpClient can send CONNECT to the server - S8025917: JDK demo applets not running with >=7u40 or (JDK 8 and JDK 9) + - S8026303: CMS: JVM intermittently crashes with "FreeList of size 258 violates Conservation Principle" assert - S8026792: HOTSPOT: licensee reports a JDK8 build failure after 8005849/8005008 fixes integrated. - S8027026: Change keytool -genkeypair to use -keyalg RSA - S8027348: (process) Enhancement of handling async close of ProcessInputStream - S8027359: XML parser returns incorrect parsing results + - S8027695: There should be a space before % sign in Swedish locale - S8028073: race condition in ObjectMonitor implementation causing deadlocks - S8028074: InetAddress.getByName fails with UHE "invalid IPv6 address" if host name starts with a-f - S8028159: C2: compiler stack overflow during inlining of @ForceInline methods - S8028280: ParkEvent leak when running modified runThese which only loads classes + - S8028484: [TEST_BUG][macosx] closed/java/awt/MouseInfo/JContainerMousePositionTest fails - S8028616: Htmleditorkit parser doesn't handle leading slash (/) - S8028617: Dvorak keyboard mapping not honored when ctrl key pressed - S8028623: SA: hash codes in SymbolTable mismatching java_lang_String::hash_code for extended characters. @@ -109,11 +130,13 @@ - S8030698: Several GUI labels in jconsole need correction - S8030712: TEST_BUG : java/lang/ProcessBuilder/BasicLauncher.java fails if java output contains VM warning - S8030878: JConsole issues meaningless message if SSL connection fails + - S8030976: Untaken paths should be more vigorously pruned at highest optimization level - S8031046: Native Windows ccache might still get unsupported ticket - S8031061: new hotspot build - hs24.60-b07 - S8031068: java/util/logging/ParentLoggersTest.java: checkLoggers: getLoggerNames() returned unexpected loggers - S8031290: Adjust call to getisax() for additional words returned - S8031435: Ftp download does not work properly for ftp user without password + - S8031566: regression test failure, SSLEngineBadBufferArrayAccess.java - S8031572: jarsigner -verify exits with 0 when a jar file is not properly signed - S8031743: C2: loadI2L_immI broken for negative memory values - S8031764: tmtools/jmap/heap_config tests fail on Linux-ia32 because it Cant attach to the core file @@ -133,8 +156,12 @@ - S8033113: wsimport fails on WSDL:header parameter name customization - S8033524: Set minor version for hotspot in 7u80 to 80 and build number to b01 - S8033571: [parfait] warning from b128 for security/smartcardio/pcsc_md.c: JNI exception pending + - S8033627: UTC+02:00 time zones are not detected correctly on Windows - S8033696: "assert(thread != NULL) failed: just checking" due to Thread::current() and JNI pthread interaction + - S8033699: Incorrect radio button behavior - S8033970: new hotspot build - hs24.80-b02 + - S8038919: Requesting focus to a modeless dialog doesn't work on Safari + - S8038966: JAX-WS handles wrongly xsd:any arguments for Web services - S8034118: [parfait] JNI exception pending in macosx/native/sun/awt/JavaComponentAccessibility.m - S8034200: Test java/net/CookieHandler/LocalHostCookie.java fails after fix of JDK-7169142 - S8034262: Test java/lang/ProcessBuilder/CloseRace.java fails @@ -179,10 +206,14 @@ - S8041408: Increment hsx 24.55 build to b04 for 7u55-b34 - S8041451: com.sun.jndi.ldap.Connection:ReadTimeout should abandon ldap request - S8041507: Java Access Bridge version strings need to be fixed + - S8041572: [macosx] huge native memory leak in AWTWindow.m - S8041725: Nimbus JList selection colors persist across L&F changes - S8041791: String.toLowerCase regression - violates Unicode standard - S8041918: BootstrapMethods attribute cannot be empty. - S8041931: test/sun/net/www/http/HttpClient/B8025710.java fails with cannot find keystore + - S8041979: sun/jvmstat/monitor/MonitoredVm/CR6672135.java failing on all platforms + - S8041980: (hotspot) sun/jvmstat/monitor/MonitoredVm/CR6672135.java failing on all platforms + - S8041984: CompilerThread seems to occupy all CPU in a very rare situation - S8041990: [macosx] Language specific keys does not work in applets when opened outside the browser - S8042052: assert(t != NULL) failed: must set before get - S8042059: Various fixes to linux/sparc @@ -213,13 +244,16 @@ - S8046024: JDI shared memory transport failed with "Observed abandoned IP mutex" - S8046233: VerifyError on backward branch - S8046269: Build broken : THIS_FILE : undeclared identifier + - S8046275: Fastdebug build failing on jdk9/hs/ control jobs after pulling some hs-comp changes - S8046287: [TESTBUG] runtime/Thread/TestThreadDumpMonitorContention.java failed error_cnt=12 - S8046343: (smartcardio) CardTerminal.connect('direct') does not work on MacOSX - S8046495: KeyEvent can not be accepted in quick mouse clicking - S8046516: Segmentation fault in JVM (easily reproducible) - S8046559: NPE when changing Windows theme + - S8046588: test for SO_FLOW_SLA availability does not check for EACCESS - S8046769: Set T family feature bit on Niagara systems - S8047186: jdk.net.Sockets throws InvocationTargetException instead of original runtime exceptions + - S8047187: Test jdk/net/Sockets/Test.java fails to compile after fix JDK-8046588 - S8048080: (smartcardio) javax.smartcardio.Card.openLogicalChannel() dosn't work on MacOSX - S8048110: Using tables in JTextPane leads to infinite loop in FlowLayout.layoutRow - S8048212: Two tests failed with "java.net.SocketException: Bad protocol option" on Windows after 8029607 @@ -233,6 +267,7 @@ - S8049542: C2: assert(size_in_words <= (julong)max_jint) failed: no overflow - S8049684: pstack crashes on java core dump - S8049787: Increment hsx 24.72 build to b03 for 7u72-b04 + - S8050022: linux-sparcv9: assert(SharedSkipVerify || obj->is_oop()) failed: sanity check - S8050158: Introduce system property to maintain RC4 preference order - S8050165: linux-sparcv9: NMT detail causes assert((intptr_t*)younger_sp[FP->sp_offset_in_saved_window()] == (intptr_t*)((intptr_t)sp - STACK_BIAS)) failed: younger_sp must be valid - S8050167: linux-sparcv9: hs_err file does not show any stack information @@ -240,23 +275,40 @@ - S8050485: super() in a try block in a ctor causes VerifyError - S8051004: javac, incorrect bug id in tests for JDK-8050386 - S8051359: JPopupMenu creation in headless mode with JDK9b23 causes NPE + - S8051614: smartcardio TCK tests fail due to lack of 'reset' permission - S8051844: BootstrapMethods attribute cannot be empty again + - S8051857: OperationTimedOut exception inside from XToolkit.syncNativeQueue call - S8052159: TEST_BUG: javax/swing/JTextField/8036819/bug8036819.java fails to compile + - S8052406: SSLv2Hello protocol may be filter out unexpectedly - S8054019: Keytool Error publicKey's is not X.509, but X509 - S8054530: C2: assert(res == old_res) failed: Inconsistency between old and new - S8054817: File ccache only recognizes Linux and Solaris defaults - S8054841: (process) ProcessBuilder leaks native memory - S8054883: Segmentation error while running program + - S8055222: Currency update needed for ISO 4217 Amendment #159 - S8055421: (fs) bad error handling in java.base/unix/native/libnio/fs/UnixNativeDispatcher.c - S8055714: Increment hsx 24.72 build to b04 for 7u72-b11 - S8055731: sun/security/smartcardio/TestDirect.java throws java.lang.IndexOutOfBoundsException - S8055949: ByteArrayOutputStream capacity should be maximal array size permitted by VM + - S8056026: Debug security logging should print Provider used for each crypto operation - S8056156: [TEST_BUG] Test javax/swing/JFileChooser/8046391/bug8046391.java fails in Windows - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure + - S8056914: Right Click Menu for Paste not showing after upgrading to java 7 - S8057184: JCK8's api/javax_swing/JDesktopPane/descriptions.html#getset failed with GTKLookAndFeel on Linux and Solaris + - S8057530: (process) Runtime.exec throws garbled message in jp locale - S8057564: JVM hangs at getAgentProperties after attaching to VM with lower - S8057813: Alterations to jdk_security3 test target + - S8058120: Rendering / caret errors with HTMLDocument + - S8058473: "Comparison method violates its general contract" when using Clipboard + - S8058927: ATG throws ClassNotFoundException + - S8058932: java/net/InetAddress/IPv4Formats.java failed because hello.foo.bar does exist - S8058936: hotspot/test/Makefile should use jtreg script from $JT_HOME/bin/jreg (instead of $JT_HOME/win32/bin/jtreg) + - S8059206: (tz) Support tzdata2014i + - S8059299: assert(adr_type != NULL) failed: expecting TypeKlassPtr + - S8059563: (proxy) sun.misc.ProxyGenerator.generateProxyClass should create intermediate directories + - S8060006: No Russian time zones mapping for Windows + - S8060169: Update the Crash Reporting URL in the Java crash log + - S8062744: jdk.net.Sockets.setOption/getOption does not support IP_TOS * Backports - S7172012, PR2067: Make test-in-build an option (Queens) - S8000897, RH1155012: VM crash in CompileBroker @@ -266,6 +318,7 @@ - PR1847: Synchronise javac.in with IcedTea6 - PR2060: Fix warnings found by Gentoo ebuild QA with gcc 4.9.1 - PR2069: Type-punning warnings still evident on RHEL 5 + - PR2094, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure * CACAO - PR2032: CACAO lacks JVM_FindClassFromCaller introduced by security patch in 2.5.3 * AArch64 port
--- a/acinclude.m4 Wed Nov 12 21:21:51 2014 +0000 +++ b/acinclude.m4 Thu Dec 04 19:46:52 2014 +0000 @@ -2864,3 +2864,49 @@ AC_MSG_RESULT([$enable_queens]) AM_CONDITIONAL([ENABLE_QUEENS], test x"${enable_queens}" = "xyes") ]) + +AC_DEFUN_ONCE([IT_PR64174_CHECK],[ +AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK]) +AC_CACHE_CHECK([if java.text.SimpleDateFormat exhibits Classpath bug 64174], it_cv_cp64174, [ + CLASS=Test.java + BYTECODE=$(echo $CLASS|sed 's#\.java##') + mkdir tmp.$$ + cd tmp.$$ + cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Locale; +import java.util.TimeZone; + +public class Test +{ + public static void main(String[] args) + throws ParseException + { + SimpleDateFormat format; + + format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US); + format.setTimeZone(TimeZone.getTimeZone("GMT")); + format.setLenient(false); + System.out.println(format.parse("2014-12-31-22-00-00")); + } +}] +EOF + if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then + it_cv_cp64174=no; + else + it_cv_cp64174=yes; + fi + else + it_cv_cp64174=yes; + fi + rm -f $CLASS *.class + cd .. + rmdir tmp.$$ + ]) +AM_CONDITIONAL([CP64174], test x"${it_cv_cp64174}" = "xyes") +AC_PROVIDE([$0])dnl +])
--- a/configure.ac Wed Nov 12 21:21:51 2014 +0000 +++ b/configure.ac Thu Dec 04 19:46:52 2014 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.6.0pre11], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [2.6.0pre12], [distro-pkg-dev@openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) @@ -148,6 +148,9 @@ dnl Check whether the HTTP server API is present in the bootstrap JDK, required by JAXWS IT_CHECK_FOR_CLASS([COM_SUN_NET_HTTPSERVER_HEADERS], [com.sun.net.httpserver.Headers]) +dnl Check whether the JDK can parse the dates used in the currency file +IT_PR64174_CHECK + IT_CHECK_ENABLE_WARNINGS IT_DIAMOND_CHECK IT_BYTECODE7_CHECK
--- a/hotspot.map.in Wed Nov 12 21:21:51 2014 +0000 +++ b/hotspot.map.in Thu Dec 04 19:46:52 2014 +0000 @@ -1,2 +1,2 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ e13857ecc787 8f5afd290d3afde6633892538117751e068a4a67dd0eeb797fedaf1a369fa0e8 +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 0c2099cd04cd b5b1bab2ba887392a9c4a9f95904b910a076e6417b182383a4d5988832eb9a3c
--- a/patches/boot/ecj-diamond.patch Wed Nov 12 21:21:51 2014 +0000 +++ b/patches/boot/ecj-diamond.patch Thu Dec 04 19:46:52 2014 +0000 @@ -1,6 +1,6 @@ diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-08-26 17:33:01.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-08-27 20:14:12.708188437 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-11-28 03:10:17.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/encoding/CachedCodeBase.java 2014-11-28 15:55:01.049797223 +0000 @@ -58,7 +58,7 @@ private CorbaConnection conn; @@ -11,8 +11,8 @@ public static synchronized void cleanCache( ORB orb ) { synchronized (iorMapLock) { diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2014-08-27 20:52:41.924822884 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2014-08-27 20:51:46.160036468 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2014-11-28 03:10:17.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java 2014-11-28 15:55:01.049797223 +0000 @@ -50,7 +50,7 @@ */ private class HookPutFields extends ObjectOutputStream.PutField @@ -23,8 +23,8 @@ /** * Put the value of the named boolean field into the persistent field. diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-08-26 17:33:01.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-08-27 20:14:12.708188437 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-11-28 03:10:17.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java 2014-11-28 15:55:01.049797223 +0000 @@ -1315,7 +1315,7 @@ protected void shutdownServants(boolean wait_for_completion) { Set<ObjectAdapterFactory> oaset; @@ -35,8 +35,8 @@ for (ObjectAdapterFactory oaf : oaset) diff -Nru openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java ---- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-08-26 17:33:01.000000000 +0100 -+++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-08-27 20:14:12.708188437 +0100 +--- openjdk-boot.orig/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-11-28 03:10:17.000000000 +0000 ++++ openjdk-boot/corba/src/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java 2014-11-28 15:55:01.049797223 +0000 @@ -108,7 +108,7 @@ private ThreadGroup threadGroup; @@ -56,8 +56,8 @@ for (WorkerThread wt : copy) { diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java ---- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-08-27 20:02:23.754188862 +0100 -+++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-08-27 20:14:12.708188437 +0100 +--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-11-28 07:13:39.125924468 +0000 ++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-11-28 15:55:01.049797223 +0000 @@ -297,8 +297,8 @@ // private final static class EncodingInfos { @@ -79,8 +79,8 @@ final String javaName = (String) keys.nextElement(); final String[] mimes = parseMimeTypes(props.getProperty(javaName)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-08-27 20:14:12.708188437 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/decoder/DocumentHandler.java 2014-11-28 15:55:01.049797223 +0000 @@ -63,9 +63,10 @@ */ public final class DocumentHandler extends DefaultHandler { @@ -96,8 +96,8 @@ private Reference<ClassLoader> loader; private ExceptionListener listener; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-08-27 20:14:12.708188437 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/TypeResolver.java 2014-11-28 15:55:01.049797223 +0000 @@ -46,7 +46,7 @@ */ public final class TypeResolver { @@ -117,8 +117,8 @@ CACHE.put(actual, map); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-08-27 20:14:12.708188437 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/beans/util/Cache.java 2014-11-28 15:55:01.049797223 +0000 @@ -45,7 +45,7 @@ private final Kind keyKind; // a reference kind for the cache keys private final Kind valueKind; // a reference kind for the cache values @@ -165,8 +165,8 @@ }; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-08-27 20:14:12.708188437 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Attribute.java 2014-11-28 15:55:01.049797223 +0000 @@ -104,9 +104,9 @@ return this.def.compareTo(that.def); } @@ -238,8 +238,8 @@ for (int i = 0; i < layout.length(); i++) { if (layout.charAt(i++) != '[') diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-08-27 20:02:25.262210201 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-11-28 07:13:39.177925171 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/BandStructure.java 2014-11-28 15:55:01.053797276 +0000 @@ -257,7 +257,7 @@ assert(basicCodings[_meta_default] == null); assert(basicCodings[_meta_canon_min] != null); @@ -302,8 +302,8 @@ return true; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-08-27 20:02:23.526185635 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-11-28 07:13:39.021923061 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java 2014-11-28 15:55:01.053797276 +0000 @@ -466,7 +466,7 @@ void readInnerClasses(Class cls) throws IOException { @@ -314,8 +314,8 @@ InnerClass ic = new InnerClass(readClassRef(), diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/CodingChooser.java 2014-11-28 15:55:01.053797276 +0000 @@ -743,9 +743,9 @@ // Steps 1/2/3 are interdependent, and may be iterated. // Steps 4 and 5 may be decided independently afterward. @@ -352,8 +352,8 @@ if (popset.add(values[i])) popvals.add(values[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Coding.java 2014-11-28 15:55:01.053797276 +0000 @@ -402,7 +402,7 @@ private static Map<Coding, Coding> codeMap; @@ -364,8 +364,8 @@ Coding x1 = codeMap.get(x0); if (x1 == null) codeMap.put(x0, x1 = x0); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ConstantPool.java 2014-11-28 15:55:01.053797276 +0000 @@ -921,7 +921,7 @@ public static Index[] partition(Index ix, int[] keys) { @@ -394,8 +394,8 @@ Entry e = work.previous(); work.remove(); // pop stack diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-08-27 20:02:25.682216144 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-11-28 07:13:39.177925171 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java 2014-11-28 15:55:01.053797276 +0000 @@ -61,7 +61,7 @@ ResourceBundle.getBundle("com.sun.java.util.jar.pack.DriverResource"); @@ -433,8 +433,8 @@ for (String optline : options.split("\n")) { String[] words = optline.split("\\p{Space}+"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/FixedList.java 2014-11-28 15:55:01.053797276 +0000 @@ -45,7 +45,7 @@ private final ArrayList<E> flist; @@ -445,8 +445,8 @@ for (int i = 0 ; i < capacity ; i++) { flist.add(null); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-08-27 20:02:23.586186484 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-11-28 07:13:39.021923061 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java 2014-11-28 15:55:01.053797276 +0000 @@ -112,7 +112,7 @@ public static final Attribute.Layout attrSourceFileSpecial; public static final Map<Attribute.Layout, Attribute> attrDefs; @@ -602,8 +602,8 @@ // Add to the end of ths list: if (!fileSet.contains(cls.file)) diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-08-27 20:02:25.682216144 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-11-28 07:13:39.181925225 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageReader.java 2014-11-28 15:55:01.053797276 +0000 @@ -686,7 +686,7 @@ cp_Signature_classes.expectLength(getIntTotal(numSigClasses)); cp_Signature_classes.readFrom(in); @@ -717,8 +717,8 @@ ClassEntry thisClass = curClass.thisClass; ClassEntry superClass = curClass.superClass; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-08-27 20:02:25.682216144 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-11-28 07:13:39.181925225 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackageWriter.java 2014-11-28 15:55:01.053797276 +0000 @@ -116,7 +116,7 @@ int[][] attrCounts; // count attr. occurences @@ -774,8 +774,8 @@ for (Class cls : pkg.classes) { if (!cls.hasInnerClasses()) continue; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PackerImpl.java 2014-11-28 15:55:01.053797276 +0000 @@ -183,8 +183,8 @@ final Map<Attribute.Layout, Attribute> attrDefs; final Map<Attribute.Layout, String> attrCommands; @@ -806,8 +806,8 @@ for (JarEntry je : Collections.list(jf.entries())) { InFile inFile = new InFile(jf, je); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-08-27 20:14:12.712188492 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PopulationCoding.java 2014-11-28 15:55:01.053797276 +0000 @@ -309,7 +309,7 @@ // As each new value is added, we assert that the value // was not already in the set. @@ -818,8 +818,8 @@ maxForDebug += fillp; int min = Integer.MIN_VALUE; // farthest from the center diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-08-27 20:02:25.682216144 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-08-27 20:14:12.716188547 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-11-28 07:13:39.181925225 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/PropMap.java 2014-11-28 15:55:01.053797276 +0000 @@ -48,8 +48,8 @@ */ @@ -850,8 +850,8 @@ while (res.remove(null)); return res; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-08-27 20:14:12.716188547 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/TLGlobals.java 2014-11-28 15:55:01.053797276 +0000 @@ -58,12 +58,12 @@ private final Map<String, MemberEntry> memberEntries; @@ -872,8 +872,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-08-27 20:02:25.682216144 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-08-27 20:14:12.716188547 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-11-28 07:13:39.181925225 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/UnpackerImpl.java 2014-11-28 15:55:01.057797329 +0000 @@ -233,7 +233,7 @@ props.setProperty(java.util.jar.Pack200.Unpacker.PROGRESS,"50"); pkg.ensureAllClassFiles(); @@ -884,8 +884,8 @@ String name = file.nameString; JarEntry je = new JarEntry(Utils.getJarEntryName(name)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-08-27 20:02:25.682216144 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-08-27 20:14:12.716188547 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-11-28 07:13:39.181925225 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Utils.java 2014-11-28 15:55:01.057797329 +0000 @@ -132,7 +132,7 @@ // Keep a TLS point to the global data and environment. // This makes it simpler to supply environmental options @@ -896,8 +896,8 @@ // convenience methods to access the TL globals static TLGlobals getTLGlobals() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-08-27 20:15:26.053222310 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java 2014-11-28 15:55:01.057797329 +0000 @@ -56,7 +56,7 @@ // principal in the delegated subject // @@ -908,8 +908,8 @@ final String pname = p.getClass().getName() + "." + p.getName(); permissions.add(new SubjectDelegationPermission(pname)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-08-27 20:14:12.716188547 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/AbstractLine.java 2014-11-28 15:55:01.057797329 +0000 @@ -54,7 +54,7 @@ * Contains event dispatcher per thread group. */ @@ -920,8 +920,8 @@ /** * Constructs a new AbstractLine. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2014-08-27 20:14:12.784189506 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/JDK13Services.java 2014-11-28 15:55:01.057797329 +0000 @@ -102,7 +102,7 @@ && !SoundbankReader.class.equals(serviceClass) && !MidiFileWriter.class.equals(serviceClass) @@ -932,8 +932,8 @@ providers = JSSecurityManager.getProviders(serviceClass); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-08-27 20:14:12.716188547 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/media/sound/RealTimeSequencer.java 2014-11-28 15:55:01.057797329 +0000 @@ -59,7 +59,7 @@ * dispatcher instance with a factory in EventDispatcher */ @@ -944,8 +944,8 @@ /** * All RealTimeSequencers share this info object. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2014-08-27 20:14:12.716188547 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java 2014-11-28 15:55:01.057797329 +0000 @@ -231,7 +231,7 @@ * Create an empty ExecOptionPermissionCollection. */ @@ -956,8 +956,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2014-08-27 20:14:12.716188547 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rmi/rmid/ExecPermission.java 2014-11-28 15:55:01.057797329 +0000 @@ -235,7 +235,7 @@ * Create an empty ExecPermissionCollection. */ @@ -968,8 +968,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-08-27 20:14:12.716188547 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/CachedRowSetImpl.java 2014-11-28 15:55:01.057797329 +0000 @@ -1285,7 +1285,7 @@ */ public Collection<?> toCollection() throws SQLException { @@ -989,8 +989,8 @@ // create a copy CachedRowSetImpl crsTemp; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/rowset/JoinRowSetImpl.java 2014-11-28 15:55:01.061797382 +0000 @@ -222,7 +222,7 @@ // either of the setter methods have been set. if(boolColId){ @@ -1001,8 +1001,8 @@ if( (strMatchKey = (cRowset.getMatchColumnNames())[i]) != null) { iMatchKey = cRowset.findColumn(strMatchKey); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/callback/DialogCallbackHandler.java 2014-11-28 15:55:01.061797382 +0000 @@ -99,10 +99,10 @@ throws UnsupportedCallbackException { @@ -1017,8 +1017,8 @@ ConfirmationInfo confirmation = new ConfirmationInfo(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/login/ConfigFile.java 2014-11-28 15:55:01.061797382 +0000 @@ -152,7 +152,7 @@ // new configuration @@ -1047,8 +1047,8 @@ String value; while (peek(";") == false) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/JndiLoginModule.java 2014-11-28 15:55:01.061797382 +0000 @@ -184,7 +184,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -1059,8 +1059,8 @@ // initial state private Subject subject; diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java 2014-11-28 15:55:01.061797382 +0000 @@ -658,7 +658,7 @@ throw new FailedLoginException( "Unable to find X.509 certificate chain in keystore"); @@ -1071,8 +1071,8 @@ certList.add(fromKeyStore[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/SolarisLoginModule.java 2014-11-28 15:55:01.061797382 +0000 @@ -76,7 +76,7 @@ private SolarisNumericUserPrincipal UIDPrincipal; private SolarisNumericGroupPrincipal GIDPrincipal; @@ -1083,8 +1083,8 @@ /** * Initialize this <code>LoginModule</code>. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/module/UnixLoginModule.java 2014-11-28 15:55:01.061797382 +0000 @@ -70,7 +70,7 @@ private UnixNumericUserPrincipal UIDPrincipal; private UnixNumericGroupPrincipal GIDPrincipal; @@ -1095,8 +1095,8 @@ /** * Initialize this <code>LoginModule</code>. diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/security/auth/PolicyFile.java 2014-11-28 15:55:01.061797382 +0000 @@ -1180,7 +1180,7 @@ // Done return certs; @@ -1107,8 +1107,8 @@ while (i < certs.length) { userCertList.add(certs[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java ---- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java 2014-11-28 15:55:01.061797382 +0000 @@ -59,7 +59,7 @@ // Maps ThreadReference to ThreadTrace instances @@ -1119,8 +1119,8 @@ EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) { super("event-handler"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java ---- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/Introspector.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/beans/Introspector.java 2014-11-28 15:55:01.061797382 +0000 @@ -97,7 +97,7 @@ public final static int IGNORE_ALL_BEANINFO = 3; @@ -1149,8 +1149,8 @@ } return targetBeanInfo; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java ---- openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2014-08-27 20:14:12.784189506 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/MethodRef.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/beans/MethodRef.java 2014-11-28 15:55:01.061797382 +0000 @@ -44,7 +44,7 @@ } else { @@ -1170,8 +1170,8 @@ } return isPackageAccessible(method.getDeclaringClass()) ? method : null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java ---- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/beans/ThreadGroupContext.java 2014-11-28 15:55:01.061797382 +0000 @@ -96,7 +96,7 @@ BeanInfo putBeanInfo(Class<?> type, BeanInfo info) { @@ -1182,8 +1182,8 @@ return this.beanInfoCache.put(type, info); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/DeleteOnExitHook.java 2014-11-28 15:55:01.061797382 +0000 @@ -34,7 +34,7 @@ */ @@ -1203,8 +1203,8 @@ // reverse the list to maintain previous jdk deletion order. // Last in first deleted. diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileInputStream.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileInputStream.java 2014-11-28 15:55:01.061797382 +0000 @@ -61,7 +61,7 @@ private volatile boolean closed = false; @@ -1215,8 +1215,8 @@ private static boolean isRunningFinalize() { Boolean val; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/File.java openjdk-boot/jdk/src/share/classes/java/io/File.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/File.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/File.java 2014-11-28 15:55:01.061797382 +0000 @@ -1150,7 +1150,7 @@ if ((names == null) || (filter == null)) { return names; @@ -1245,8 +1245,8 @@ File f = new File(s, this); if ((filter == null) || filter.accept(f)) diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FileOutputStream.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FileOutputStream.java 2014-11-28 15:55:01.061797382 +0000 @@ -76,7 +76,7 @@ private final Object closeLock = new Object(); private volatile boolean closed = false; @@ -1257,8 +1257,8 @@ private static boolean isRunningFinalize() { Boolean val; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2014-08-27 20:14:12.720188604 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/FilePermission.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/FilePermission.java 2014-11-28 15:55:01.061797382 +0000 @@ -725,7 +725,7 @@ */ @@ -1287,8 +1287,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2014-08-27 20:14:12.724188662 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectInputStream.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectInputStream.java 2014-11-28 15:55:01.065797435 +0000 @@ -214,7 +214,7 @@ /** table mapping primitive type names to corresponding class objects */ @@ -1313,8 +1313,8 @@ /** filter stream for handling block data conversion */ diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2014-08-27 20:14:12.724188662 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectOutputStream.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectOutputStream.java 2014-11-28 15:55:01.065797435 +0000 @@ -166,11 +166,11 @@ private static class Caches { /** cache of subclass security audit results */ @@ -1339,8 +1339,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java ---- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2014-08-27 20:14:12.724188662 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/io/ObjectStreamClass.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/io/ObjectStreamClass.java 2014-11-28 15:55:01.065797435 +0000 @@ -87,18 +87,18 @@ private static class Caches { /** cache mapping local classes -> descriptors */ @@ -1430,8 +1430,8 @@ if (ref != null) { Caches.reflectors.remove(key, ref); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2014-08-27 20:14:12.724188662 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ApplicationShutdownHooks.java 2014-11-28 15:55:01.065797435 +0000 @@ -47,7 +47,7 @@ } } @@ -1442,8 +1442,8 @@ // application shutdown hooks cannot be added if // shutdown is in progress. diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java openjdk-boot/jdk/src/share/classes/java/lang/Character.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2014-08-27 20:14:12.724188662 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Character.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Character.java 2014-11-28 15:55:01.065797435 +0000 @@ -646,7 +646,8 @@ */ public static final class UnicodeBlock extends Subset { @@ -1464,8 +1464,8 @@ aliases.put("ARMI", IMPERIAL_ARAMAIC); aliases.put("ARMN", ARMENIAN); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2014-08-27 20:14:12.724188662 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/CharacterName.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/CharacterName.java 2014-11-28 15:55:01.065797435 +0000 @@ -81,7 +81,7 @@ } while (cpOff < cpEnd); strPool = new byte[total - cpEnd]; @@ -1476,9 +1476,9 @@ throw new InternalError(x.getMessage()); } finally { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java openjdk-boot/jdk/src/share/classes/java/lang/Class.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2014-08-27 20:14:12.724188662 +0100 -@@ -1346,7 +1346,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Class.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Class.java 2014-11-28 15:55:01.065797435 +0000 +@@ -1357,7 +1357,7 @@ return java.security.AccessController.doPrivileged( new java.security.PrivilegedAction<Class<?>[]>() { public Class[] run() { @@ -1487,7 +1487,7 @@ Class<?> currentClass = Class.this; while (currentClass != null) { Class<?>[] members = currentClass.getDeclaredClasses(); -@@ -2429,9 +2429,9 @@ +@@ -2440,9 +2440,9 @@ if (!useCaches) return null; while (true) { @@ -1499,7 +1499,7 @@ return rd; } // else retry -@@ -2516,9 +2516,9 @@ +@@ -2527,9 +2527,9 @@ // No cached value available; compute value recursively. // Traverse in correct order for getField(). @@ -1511,7 +1511,7 @@ } // Local fields -@@ -3145,7 +3145,7 @@ +@@ -3156,7 +3156,7 @@ if (universe == null) throw new IllegalArgumentException( getName() + " is not an enum type"); @@ -1520,7 +1520,7 @@ for (T constant : universe) m.put(((Enum<?>)constant).name(), constant); enumConstantDirectory = m; -@@ -3269,7 +3269,7 @@ +@@ -3280,7 +3280,7 @@ if (superClass == null) { annotations = declaredAnnotations; } else { @@ -1530,8 +1530,8 @@ for (Map.Entry<Class<? extends Annotation>, Annotation> e : superClass.annotations.entrySet()) { Class<? extends Annotation> annotationClass = e.getKey(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2014-08-27 20:14:12.724188662 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassLoader.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassLoader.java 2014-11-28 15:55:01.065797435 +0000 @@ -248,7 +248,7 @@ // The classes loaded by this class loader. The only purpose of this table @@ -1638,8 +1638,8 @@ for(int i = 0; i < directives.classes.length; i++) diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ClassValue.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ClassValue.java 2014-11-28 15:55:01.069797488 +0000 @@ -297,12 +297,12 @@ * Some machines may also require a barrier instruction to execute * before this.version. @@ -1681,8 +1681,8 @@ // As soon as the Entry is put into the cache, the value will be // reachable via a data race (as defined by the Java Memory Model). diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-08-27 20:02:28.854261033 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-11-28 07:13:39.217925712 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-11-28 15:55:01.069797488 +0000 @@ -393,7 +393,7 @@ } private boolean isPlaceholder() { return clazz == null; } @@ -1693,8 +1693,8 @@ SpeciesData extendWithType(char type) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/DirectMethodHandle.java 2014-11-28 15:55:01.069797488 +0000 @@ -327,7 +327,7 @@ if (UNSAFE.shouldBeInitialized(type)) // If the previous call didn't block, this can happen. @@ -1705,8 +1705,8 @@ } static final EnsureInitialized INSTANCE = new EnsureInitialized(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-08-27 20:02:28.854261033 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-11-28 07:13:39.217925712 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java 2014-11-28 15:55:01.069797488 +0000 @@ -129,7 +129,7 @@ static { @@ -1726,8 +1726,8 @@ int cph = 0; // for counting constant placeholders diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-08-27 20:02:28.854261033 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-11-28 07:13:39.221925766 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-11-28 15:55:01.069797488 +0000 @@ -468,12 +468,12 @@ int capacity = 512; // expect many distinct signatures over time float loadFactor = 0.75f; // normal default @@ -1744,8 +1744,8 @@ if (!m.isStatic() || !m.isPackage()) continue; MethodType mt = m.getMethodType(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MemberName.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MemberName.java 2014-11-28 15:55:01.069797488 +0000 @@ -808,14 +808,14 @@ // JVM returned to us with an intentional overflow! totalCount += buf.length; @@ -1764,8 +1764,8 @@ for (MemberName[] buf0 : bufs) { Collections.addAll(result, buf0); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-08-27 20:02:28.854261033 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-11-28 07:13:39.221925766 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleImpl.java 2014-11-28 15:55:01.069797488 +0000 @@ -73,8 +73,8 @@ static final class ArrayAccessor { @@ -1787,8 +1787,8 @@ for (;;) { int nargs = invokes.size(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandle.java 2014-11-28 15:55:01.069797488 +0000 @@ -834,7 +834,7 @@ } } @@ -1799,9 +1799,9 @@ ptypes.set(i, arrayElement); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2014-08-27 20:14:12.728188719 +0100 -@@ -1929,7 +1929,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandles.java 2014-11-28 15:55:01.069797488 +0000 +@@ -1950,7 +1950,7 @@ int inargs = outargs + dropped; if (pos < 0 || pos >= inargs) throw newIllegalArgumentException("no argument type to remove"); @@ -1811,8 +1811,8 @@ if (ptypes.size() != inargs) throw newIllegalArgumentException("valueTypes"); MethodType newType = MethodType.methodType(oldType.returnType(), ptypes); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodType.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodType.java 2014-11-28 15:55:01.069797488 +0000 @@ -1048,7 +1048,7 @@ private final float loadFactor; @@ -1823,8 +1823,8 @@ private Entry[] newTable(int n) { return new Entry[n]; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2014-08-27 20:02:24.934205560 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2014-11-28 07:13:39.129924522 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2014-11-28 15:55:01.069797488 +0000 @@ -789,7 +789,7 @@ getPlatformManagementInterfaces() { @@ -1835,8 +1835,8 @@ result.add(component.getMXBeanInterface()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/management/PlatformComponent.java 2014-11-28 15:55:01.069797488 +0000 @@ -287,7 +287,7 @@ List<T> getGcMXBeanList(Class<T> gcMXBeanIntf) { List<GarbageCollectorMXBean> list = @@ -1874,8 +1874,8 @@ // Use String as the key rather than Class<?> to avoid // causing unnecessary class loading of management interface diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java openjdk-boot/jdk/src/share/classes/java/lang/Package.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2014-08-27 20:02:25.686216202 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2014-08-27 20:14:12.728188719 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Package.java 2014-11-28 07:13:39.181925225 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Package.java 2014-11-28 15:55:01.069797488 +0000 @@ -599,13 +599,16 @@ } @@ -1897,8 +1897,8 @@ private static native String getSystemPackage0(String name); private static native String[] getSystemPackages0(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-08-27 20:02:24.998206465 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-11-28 07:13:39.129924522 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-11-28 15:55:01.069797488 +0000 @@ -214,7 +214,7 @@ * @param command a string array containing the program and its arguments */ @@ -1918,8 +1918,8 @@ this.command.add(arg); return this; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Constructor.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Constructor.java 2014-11-28 15:55:01.073797541 +0000 @@ -137,7 +137,7 @@ // which implicitly requires that new java.lang.reflect // objects be fabricated for each reflective call on Class @@ -1930,8 +1930,8 @@ exceptionTypes, modifiers, slot, signature, diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-08-27 20:02:24.998206465 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-11-28 07:13:39.129924522 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-11-28 15:55:01.073797541 +0000 @@ -234,7 +234,7 @@ * a cache of proxy classes */ @@ -1951,8 +1951,8 @@ /* * Verify that the class loader resolves the name of this diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/ReflectAccess.java 2014-11-28 15:55:01.073797541 +0000 @@ -84,7 +84,7 @@ byte[] annotations, byte[] parameterAnnotations) @@ -1963,8 +1963,8 @@ checkedExceptions, modifiers, diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/WeakCache.java 2014-11-28 15:55:01.073797541 +0000 @@ -71,12 +71,12 @@ } @@ -2018,8 +2018,8 @@ private final int hash; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/StringCoding.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/StringCoding.java 2014-11-28 15:55:01.073797541 +0000 @@ -53,9 +53,9 @@ /** The cached coders for each thread */ @@ -2033,8 +2033,8 @@ private static boolean warnUnsupportedCharset = true; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java openjdk-boot/jdk/src/share/classes/java/lang/String.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/String.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/String.java 2014-11-28 15:55:01.073797541 +0000 @@ -2282,7 +2282,7 @@ int off = 0; int next = 0; @@ -2045,8 +2045,8 @@ if (!limited || list.size() < limit - 1) { list.add(substring(off, next)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java openjdk-boot/jdk/src/share/classes/java/lang/Thread.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Thread.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Thread.java 2014-11-28 15:55:01.073797541 +0000 @@ -1638,7 +1638,8 @@ // Get a snapshot of the list of all threads Thread[] threads = getThreads(); @@ -2072,8 +2072,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java ---- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/lang/Throwable.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/lang/Throwable.java 2014-11-28 15:55:01.073797541 +0000 @@ -918,7 +918,7 @@ // Use the sentinel for a zero-length list suppressed = SUPPRESSED_SENTINEL; @@ -2093,8 +2093,8 @@ suppressedExceptions.add(exception); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java ---- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/InetAddress.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/InetAddress.java 2014-11-28 15:55:01.073797541 +0000 @@ -712,7 +712,7 @@ static InetAddressImpl impl; @@ -2114,8 +2114,8 @@ for (String key : cache.keySet()) { CacheEntry entry = cache.get(key); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java ---- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/net/URLClassLoader.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/net/URLClassLoader.java 2014-11-28 15:55:01.073797541 +0000 @@ -205,7 +205,7 @@ */ @@ -2126,8 +2126,8 @@ /** * Returns an input stream for reading the specified resource. diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java ---- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2014-08-27 20:02:25.686216202 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2014-08-27 20:14:12.732188774 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/nio/file/Files.java 2014-11-28 07:13:39.185925279 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/nio/file/Files.java 2014-11-28 15:55:01.073797541 +0000 @@ -1504,7 +1504,7 @@ return AccessController .doPrivileged(new PrivilegedAction<List<FileTypeDetector>>() { @@ -2147,8 +2147,8 @@ String line = reader.readLine(); if (line == null) diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/AccessControlContext.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/AccessControlContext.java 2014-11-28 15:55:01.073797541 +0000 @@ -127,7 +127,7 @@ this.context = null; } @@ -2159,8 +2159,8 @@ if ((context[i] != null) && (!v.contains(context[i]))) v.add(context[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/BasicPermission.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/BasicPermission.java 2014-11-28 15:55:01.073797541 +0000 @@ -515,7 +515,7 @@ // Copy perms into a Hashtable @@ -2171,8 +2171,8 @@ synchronized (this) { permissions.putAll(perms); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/CodeSource.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/CodeSource.java 2014-11-28 15:55:01.077797594 +0000 @@ -188,7 +188,7 @@ } else if (signers != null) { // Convert the code signers to certs @@ -2196,8 +2196,8 @@ int j = i; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java openjdk-boot/jdk/src/share/classes/java/security/Permissions.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Permissions.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Permissions.java 2014-11-28 15:55:01.077797594 +0000 @@ -362,7 +362,7 @@ // Copy perms into a Hashtable @@ -2217,8 +2217,8 @@ perms.putAll(permsMap); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java openjdk-boot/jdk/src/share/classes/java/security/Policy.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Policy.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Policy.java 2014-11-28 15:55:01.077797594 +0000 @@ -118,7 +118,7 @@ // PolicyInfo is stored in an AtomicReference @@ -2238,8 +2238,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/ProtectionDomain.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/ProtectionDomain.java 2014-11-28 15:55:01.077797594 +0000 @@ -373,8 +373,8 @@ int swag = 32; int vcap = 8; @@ -2252,8 +2252,8 @@ // // Build a vector of domain permissions for subsequent merge diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java openjdk-boot/jdk/src/share/classes/java/security/Provider.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Provider.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Provider.java 2014-11-28 15:55:01.077797594 +0000 @@ -437,7 +437,7 @@ private void readObject(ObjectInputStream in) @@ -2282,8 +2282,8 @@ Class clazz = getKeyClass(className); if (clazz != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/SecureClassLoader.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/SecureClassLoader.java 2014-11-28 15:55:01.077797594 +0000 @@ -50,7 +50,7 @@ // HashMap that maps CodeSource to ProtectionDomain // @GuardedBy("pdcache") @@ -2294,8 +2294,8 @@ private static final Debug debug = Debug.getInstance("scl"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java openjdk-boot/jdk/src/share/classes/java/security/Security.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/Security.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/Security.java 2014-11-28 15:55:01.077797594 +0000 @@ -546,7 +546,7 @@ value = filter.substring(index + 1); } @@ -2342,8 +2342,8 @@ for (int i = 0; i < providers.length; i++) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermissionCollection.java 2014-11-28 15:55:01.077797594 +0000 @@ -119,7 +119,7 @@ public Enumeration<Permission> elements() { @@ -2381,8 +2381,8 @@ // Add to Hashtable being serialized diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/security/UnresolvedPermission.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/security/UnresolvedPermission.java 2014-11-28 15:55:01.077797594 +0000 @@ -198,7 +198,7 @@ if (this.certs == null) { // extract the signer certs @@ -2393,8 +2393,8 @@ while (i < certs.length) { signerCerts.add(certs[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/AbstractList.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/AbstractList.java 2014-11-28 15:55:01.077797594 +0000 @@ -482,8 +482,8 @@ */ public List<E> subList(int fromIndex, int toIndex) { @@ -2424,8 +2424,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java openjdk-boot/jdk/src/share/classes/java/util/Arrays.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2014-08-27 20:14:12.736188829 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Arrays.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Arrays.java 2014-11-28 15:55:01.077797594 +0000 @@ -2825,7 +2825,7 @@ */ @SafeVarargs @@ -2436,8 +2436,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java openjdk-boot/jdk/src/share/classes/java/util/Collections.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2014-08-27 20:14:12.740188887 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Collections.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Collections.java 2014-11-28 15:55:01.081797648 +0000 @@ -1035,7 +1035,7 @@ * @return an unmodifiable view of the specified collection. */ @@ -3062,9 +3062,21 @@ } /** +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java openjdk-boot/jdk/src/share/classes/java/util/Currency.java +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Currency.java 2014-11-28 07:13:39.185925279 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Currency.java 2014-11-28 15:55:01.121798178 +0000 +@@ -101,7 +101,7 @@ + + // class data: instance map + +- private static ConcurrentMap<String, Currency> instances = new ConcurrentHashMap<>(7); ++ private static ConcurrentMap<String, Currency> instances = new ConcurrentHashMap<String,Currency>(7); + private static HashSet<Currency> available; + + diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2014-08-27 20:14:12.740188887 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumMap.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumMap.java 2014-11-28 15:55:01.081797648 +0000 @@ -508,7 +508,7 @@ int j = 0; for (int i = 0; i < vals.length; i++) @@ -3075,8 +3087,8 @@ return a; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2014-08-27 20:14:12.740188887 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/EnumSet.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/EnumSet.java 2014-11-28 15:55:01.081797648 +0000 @@ -110,9 +110,9 @@ throw new ClassCastException(elementType + " not an enum"); @@ -3099,8 +3111,8 @@ // readObject method for the serialization proxy pattern diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java openjdk-boot/jdk/src/share/classes/java/util/Formatter.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2014-08-27 20:02:24.998206465 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2014-08-27 20:14:12.740188887 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2014-11-28 07:13:39.133924576 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2014-11-28 15:55:01.081797648 +0000 @@ -2514,7 +2514,7 @@ * Finds format specifiers in the format string. */ @@ -3111,8 +3123,8 @@ for (int i = 0, len = s.length(); i < len; ) { if (m.find(i)) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java openjdk-boot/jdk/src/share/classes/java/util/HashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2014-08-27 20:14:12.740188887 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashMap.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashMap.java 2014-11-28 15:55:01.081797648 +0000 @@ -894,7 +894,7 @@ */ void createEntry(int hash, K key, V value, int bucketIndex) { @@ -3123,8 +3135,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java openjdk-boot/jdk/src/share/classes/java/util/HashSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2014-08-27 20:14:12.740188887 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/HashSet.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/HashSet.java 2014-11-28 15:55:01.081797648 +0000 @@ -100,7 +100,7 @@ * default initial capacity (16) and load factor (0.75). */ @@ -3171,8 +3183,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2014-08-27 20:14:12.740188887 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Hashtable.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Hashtable.java 2014-11-28 15:55:01.081797648 +0000 @@ -538,7 +538,7 @@ // Creates the new entry. @@ -3228,8 +3240,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2014-08-27 20:14:12.740188887 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/IdentityHashMap.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/IdentityHashMap.java 2014-11-28 15:55:01.081797648 +0000 @@ -1145,7 +1145,7 @@ Object[] result = new Object[size]; Iterator<Map.Entry<K,V>> it = iterator(); @@ -3249,8 +3261,8 @@ a[size] = null; return a; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2014-08-27 20:14:12.740188887 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/JumboEnumSet.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/JumboEnumSet.java 2014-11-28 15:55:01.081797648 +0000 @@ -91,7 +91,7 @@ * @return an iterator over the elements contained in this set */ @@ -3261,8 +3273,8 @@ private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2014-08-27 20:14:12.740188887 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedHashMap.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedHashMap.java 2014-11-28 15:55:01.081797648 +0000 @@ -238,7 +238,7 @@ */ @Override @@ -3282,8 +3294,8 @@ e.addBefore(header); size++; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/LinkedList.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/LinkedList.java 2014-11-28 15:55:01.081797648 +0000 @@ -122,7 +122,7 @@ */ private void linkFirst(E e) { @@ -3321,8 +3333,8 @@ first = newNode; else diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ListResourceBundle.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ListResourceBundle.java 2014-11-28 15:55:01.081797648 +0000 @@ -187,7 +187,7 @@ return; @@ -3333,8 +3345,8 @@ // key must be non-null String, value must be non-null String key = (String) contents[i][0]; diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java openjdk-boot/jdk/src/share/classes/java/util/Locale.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Locale.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Locale.java 2014-11-28 15:55:01.081797648 +0000 @@ -1793,7 +1793,7 @@ return formatList(variantNames, listPattern, listCompositionPattern); } @@ -3345,8 +3357,8 @@ names.add(languageName); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/FileHandler.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/FileHandler.java 2014-11-28 15:55:01.081797648 +0000 @@ -127,7 +127,7 @@ private FileOutputStream lockStream; private File files[]; @@ -3357,8 +3369,8 @@ // A metered stream is a subclass of OutputStream that // (a) forwards all its output to a target stream diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Level.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Level.java 2014-11-28 15:55:01.081797648 +0000 @@ -518,8 +518,8 @@ // were final, the following KnownLevel implementation can be removed. // Future API change should take this into consideration. @@ -3388,8 +3400,8 @@ } list.add(o); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logger.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logger.java 2014-11-28 15:55:01.085797700 +0000 @@ -177,7 +177,7 @@ private volatile LogManager manager; private String name; @@ -3399,7 +3411,7 @@ private volatile String resourceBundleName; private volatile boolean useParentHandlers = true; private volatile Filter filter; -@@ -1610,7 +1610,7 @@ +@@ -1613,7 +1613,7 @@ // Set our new parent. parent = newParent; if (parent.kids == null) { @@ -3409,8 +3421,8 @@ if (ref == null) { // we didn't have a previous parent diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/Logging.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/Logging.java 2014-11-28 15:55:01.085797700 +0000 @@ -56,7 +56,7 @@ public List<String> getLoggerNames() { @@ -3421,8 +3433,8 @@ for (; loggers.hasMoreElements();) { array.add((String) loggers.nextElement()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java 2014-11-28 15:55:01.085797700 +0000 @@ -389,7 +389,7 @@ final Object ecx = javaAwtAccess.getAppletContext(); if (ecx != null) { @@ -3478,8 +3490,8 @@ int end = ix; while (end < hands.length()) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogRecord.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogRecord.java 2014-11-28 15:55:01.085797700 +0000 @@ -85,7 +85,8 @@ private static final AtomicInteger nextThreadId = new AtomicInteger(MIN_SEQUENTIAL_THREAD_ID); @@ -3491,8 +3503,8 @@ /** * @serial Logging message level diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/prefs/AbstractPreferences.java 2014-11-28 15:55:01.085797700 +0000 @@ -155,7 +155,8 @@ * All known unremoved children of this node. (This "cache" is consulted * prior to calling childSpi() or getChild(). @@ -3523,8 +3535,8 @@ /** * These two classes are used to distinguish NodeChangeEvents on diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/PriorityQueue.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/PriorityQueue.java 2014-11-28 15:55:01.085797700 +0000 @@ -538,7 +538,7 @@ cursor--; else { @@ -3535,8 +3547,8 @@ } } else if (lastRetElt != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java openjdk-boot/jdk/src/share/classes/java/util/Properties.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2014-08-27 20:14:12.744188943 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/Properties.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/Properties.java 2014-11-28 15:55:01.085797700 +0000 @@ -1010,7 +1010,7 @@ * @since 1.6 */ @@ -3547,8 +3559,8 @@ return h.keySet(); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/Pattern.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/Pattern.java 2014-11-28 15:55:01.085797700 +0000 @@ -321,7 +321,7 @@ * <td headers="matches">Nothing, but quotes all characters until <tt>\E</tt></td></tr> * <tr><td valign="top" headers="construct quot"><tt>\E</tt></td> @@ -3586,8 +3598,8 @@ static { // Unicode character property aliases, defined in diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/regex/UnicodeProp.java 2014-11-28 15:55:01.085797700 +0000 @@ -193,8 +193,8 @@ } }; @@ -3600,8 +3612,8 @@ posix.put("ALPHA", "ALPHABETIC"); posix.put("LOWER", "LOWERCASE"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/RegularEnumSet.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/RegularEnumSet.java 2014-11-28 15:55:01.085797700 +0000 @@ -72,7 +72,7 @@ * @return an iterator over the elements contained in this set */ @@ -3612,8 +3624,8 @@ private class EnumSetIterator<E extends Enum<E>> implements Iterator<E> { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ResourceBundle.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ResourceBundle.java 2014-11-28 15:55:01.085797700 +0000 @@ -291,7 +291,7 @@ * name for compatibility with some workarounds for bug 4212439. */ @@ -3678,8 +3690,8 @@ if (variants != null) { for (String v : variants) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/ServiceLoader.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/ServiceLoader.java 2014-11-28 15:55:01.089797753 +0000 @@ -191,7 +191,7 @@ private ClassLoader loader; @@ -3708,8 +3720,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java openjdk-boot/jdk/src/share/classes/java/util/TimSort.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TimSort.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TimSort.java 2014-11-28 15:55:01.089797753 +0000 @@ -196,7 +196,7 @@ * extending short natural runs to minRun elements, and merging runs * to maintain stack invariant. @@ -3720,8 +3732,8 @@ do { // Identify next run diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeMap.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeMap.java 2014-11-28 15:55:01.089797753 +0000 @@ -530,7 +530,7 @@ if (t == null) { compare(key, key); // type (and possibly null) check @@ -3777,8 +3789,8 @@ // color nodes in non-full bottommost level red if (level == redLevel) diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/TreeSet.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/TreeSet.java 2014-11-28 15:55:01.089797753 +0000 @@ -138,7 +138,7 @@ * ordering} of the elements will be used. */ @@ -3846,8 +3858,8 @@ // Read in size diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/WeakHashMap.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/WeakHashMap.java 2014-11-28 15:55:01.089797753 +0000 @@ -172,7 +172,7 @@ /** * Reference queue for cleared WeakEntries @@ -3880,8 +3892,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipFile.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipFile.java 2014-11-28 15:55:01.089797753 +0000 @@ -321,7 +321,7 @@ // the outstanding inputstreams that need to be closed, @@ -3910,8 +3922,8 @@ for (Map.Entry<InputStream, Inflater> e : copy.entrySet()) { e.getKey().close(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/zip/ZipOutputStream.java 2014-11-28 15:55:01.089797753 +0000 @@ -53,8 +53,8 @@ } @@ -3924,8 +3936,8 @@ private long written = 0; private long locoff = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CryptoPermissions.java 2014-11-28 15:55:01.089797753 +0000 @@ -84,7 +84,7 @@ * no CryptoPermissionCollections. */ @@ -3964,8 +3976,8 @@ fields.put("perms", permTable); s.writeFields(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/crypto/JceSecurityManager.java 2014-11-28 15:55:01.089797753 +0000 @@ -54,7 +54,7 @@ private static final CryptoAllPermission allPerm; private static final Vector TrustedCallersCache = new Vector(2); @@ -3976,8 +3988,8 @@ new CryptoPermissions(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/script/ScriptEngineManager.java openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2014-08-27 20:14:12.784189506 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/script/ScriptEngineManager.java 2014-11-28 15:55:01.089797753 +0000 @@ -116,7 +116,7 @@ return null; } @@ -3988,8 +4000,8 @@ while (itr.hasNext()) { try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/DelegationPermission.java 2014-11-28 15:55:01.089797753 +0000 @@ -361,7 +361,7 @@ // Don't call out.defaultWriteObject() @@ -4000,8 +4012,8 @@ synchronized (this) { permissions.addAll(perms); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2014-08-27 20:14:12.748188999 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/kerberos/ServicePermission.java 2014-11-28 15:55:01.089797753 +0000 @@ -569,7 +569,7 @@ // Don't call out.defaultWriteObject() @@ -4012,8 +4024,8 @@ synchronized (this) { permissions.addAll(perms); diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/PrivateCredentialPermission.java 2014-11-28 15:55:01.089797753 +0000 @@ -329,7 +329,7 @@ throw new IllegalArgumentException("invalid empty name"); } @@ -4024,8 +4036,8 @@ String principalClass = null; String principalName = null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/security/auth/SubjectDomainCombiner.java 2014-11-28 15:55:01.089797753 +0000 @@ -48,7 +48,7 @@ private Subject subject; @@ -4035,9 +4047,69 @@ private Set<Principal> principalSet; private Principal[] principals; +diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/swing/JDesktopPane.java openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java +--- openjdk-boot.orig/jdk/src/share/classes/javax/swing/JDesktopPane.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java 2014-11-28 15:55:01.121798178 +0000 +@@ -267,7 +267,7 @@ + + private static Collection<JInternalFrame> getAllFrames(Container parent) { + int i, count; +- Collection<JInternalFrame> results = new LinkedHashSet<>(); ++ Collection<JInternalFrame> results = new LinkedHashSet<JInternalFrame>(); + count = parent.getComponentCount(); + for (i = 0; i < count; i++) { + Component next = parent.getComponent(i); +diff -Nru openjdk-boot.orig/jdk/src/share/classes/jdk/net/Sockets.java openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java +--- openjdk-boot.orig/jdk/src/share/classes/jdk/net/Sockets.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java 2014-11-28 15:59:18.781238733 +0000 +@@ -58,7 +58,7 @@ + public class Sockets { + + private final static HashMap<Class<?>,Set<SocketOption<?>>> +- options = new HashMap<>(); ++ options = new HashMap<Class<?>,Set<SocketOption<?>>>(); + + static { + initOptionSets(); +@@ -351,7 +351,7 @@ + + // Socket + +- Set<SocketOption<?>> set = new HashSet<>(); ++ Set<SocketOption<?>> set = new HashSet<SocketOption<?>>(); + set.add(StandardSocketOptions.SO_KEEPALIVE); + set.add(StandardSocketOptions.SO_SNDBUF); + set.add(StandardSocketOptions.SO_RCVBUF); +@@ -367,7 +367,7 @@ + + // ServerSocket + +- set = new HashSet<>(); ++ set = new HashSet<SocketOption<?>>(); + set.add(StandardSocketOptions.SO_RCVBUF); + set.add(StandardSocketOptions.SO_REUSEADDR); + set.add(StandardSocketOptions.IP_TOS); +@@ -376,7 +376,7 @@ + + // DatagramSocket + +- set = new HashSet<>(); ++ set = new HashSet<SocketOption<?>>(); + set.add(StandardSocketOptions.SO_SNDBUF); + set.add(StandardSocketOptions.SO_RCVBUF); + set.add(StandardSocketOptions.SO_REUSEADDR); +@@ -389,7 +389,7 @@ + + // MulticastSocket + +- set = new HashSet<>(); ++ set = new HashSet<SocketOption<?>>(); + set.add(StandardSocketOptions.SO_SNDBUF); + set.add(StandardSocketOptions.SO_RCVBUF); + set.add(StandardSocketOptions.SO_REUSEADDR); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/font/CreatedFontTracker.java 2014-11-28 15:55:01.089797753 +0000 @@ -109,7 +109,7 @@ * Note that this only applies to createFont() from an InputStream object. */ @@ -4048,8 +4120,8 @@ private static Thread t = null; static void init() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-08-27 20:02:28.854261033 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-11-28 07:13:39.221925766 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-11-28 15:55:01.089797753 +0000 @@ -60,7 +60,7 @@ EnumMap<Wrapper, MethodHandle>[] caches = (EnumMap<Wrapper, MethodHandle>[]) new EnumMap<?,?>[n]; @@ -4087,8 +4159,8 @@ MethodHandle mh = findCollector("list", mhs.size(), List.class); if (mh == null) break; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/CharacterEncoding.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/io/CharacterEncoding.java 2014-11-28 15:55:01.089797753 +0000 @@ -54,7 +54,7 @@ private static volatile boolean installedAll; @@ -4099,8 +4171,8 @@ aliasTable.put("us-ascii", "ASCII"); aliasTable.put("ascii", "ASCII"); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java openjdk-boot/jdk/src/share/classes/sun/io/Converters.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/io/Converters.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/io/Converters.java 2014-11-28 15:55:01.089797753 +0000 @@ -120,7 +120,7 @@ private static Class<?> cache(int type, Object encoding, Class<?> c) { @@ -4111,8 +4183,8 @@ return c; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2014-08-27 20:02:25.686216202 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2014-11-28 07:13:39.189925333 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java 2014-11-28 15:55:01.093797806 +0000 @@ -171,7 +171,7 @@ private static void printProperties(PrintStream ostream) { Properties p = System.getProperties(); @@ -4150,8 +4222,8 @@ System.err.println("Incoming arguments:"); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/management/jdp/JdpPacketReader.java 2014-11-28 15:55:01.093797806 +0000 @@ -120,7 +120,7 @@ String key = null, value = null; @@ -4162,8 +4234,8 @@ while (true) { key = getEntry(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/management/ManagementFactoryHelper.java 2014-11-28 15:55:01.093797806 +0000 @@ -205,7 +205,7 @@ private static List<BufferPoolMXBean> bufferPools = null; public static synchronized List<BufferPoolMXBean> getBufferPoolMXBeans() { @@ -4174,8 +4246,8 @@ .getDirectBufferPool())); bufferPools.add(createBufferPoolMXBean(sun.nio.ch.FileChannelImpl diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/spi/nameservice/dns/DNSNameService.java 2014-11-28 15:55:01.093797806 +0000 @@ -52,7 +52,7 @@ // Per-thread soft cache of the last temporary context @@ -4204,8 +4276,8 @@ // do the query diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/AuthenticationInfo.java 2014-11-28 15:55:01.093797806 +0000 @@ -111,7 +111,7 @@ * at the same time, then all but the first will block until * the first completes its authentication. @@ -4216,8 +4288,8 @@ /* check if a request for this destination is in progress * return false immediately if not. Otherwise block until diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/protocol/http/HttpURLConnection.java 2014-11-28 15:55:01.093797806 +0000 @@ -2646,7 +2646,7 @@ if (filteredHeaders != null) return filteredHeaders; @@ -4237,8 +4309,8 @@ String fVal = filterHeaderField(key, value); if (fVal != null) diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/net/www/URLConnection.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/net/www/URLConnection.java 2014-11-28 15:55:01.093797806 +0000 @@ -239,7 +239,7 @@ url = null; } @@ -4249,8 +4321,8 @@ public synchronized static void setProxiedHost(String host) { proxiedHosts.put(host.toLowerCase(), null); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/cs/AbstractCharsetProvider.java 2014-11-28 15:55:01.093797806 +0000 @@ -49,22 +49,22 @@ /* Maps canonical names to class names */ @@ -4288,8 +4360,8 @@ return new Iterator<Charset>() { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractAclFileAttributeView.java 2014-11-28 15:55:01.093797806 +0000 @@ -84,7 +84,7 @@ throw new IllegalArgumentException("'" + name() + ":" + attribute + "' not recognized"); @@ -4300,8 +4372,8 @@ result.put(ACL_NAME, getAcl()); if (owner) diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractBasicFileAttributeView.java 2014-11-28 15:55:01.093797806 +0000 @@ -89,8 +89,8 @@ * Used to build a map of attribute name/values. */ @@ -4314,8 +4386,8 @@ private AttributesBuilder(Set<String> allowed, String[] requested) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractPoller.java 2014-11-28 15:55:01.093797806 +0000 @@ -102,7 +102,7 @@ throw new NullPointerException(); if (events.length == 0) @@ -4326,8 +4398,8 @@ // standard events if (event == StandardWatchEventKinds.ENTRY_CREATE || diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2014-08-27 20:14:12.752189056 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/AbstractUserDefinedFileAttributeView.java 2014-11-28 15:55:01.093797806 +0000 @@ -77,7 +77,7 @@ throws IOException { @@ -4347,8 +4419,8 @@ int size = size(name); byte[] buf = new byte[size]; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/FileOwnerAttributeViewImpl.java 2014-11-28 15:55:01.093797806 +0000 @@ -71,7 +71,7 @@ @Override @@ -4359,8 +4431,8 @@ if (attribute.equals("*") || attribute.equals(OWNER_NAME)) { result.put(OWNER_NAME, getOwner()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/nio/fs/Util.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/nio/fs/Util.java 2014-11-28 15:55:01.093797806 +0000 @@ -63,7 +63,7 @@ * Returns a Set containing the given elements. */ @@ -4380,8 +4452,8 @@ set.add(e); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/reflect/generics/parser/SignatureParser.java 2014-11-28 15:55:01.093797806 +0000 @@ -229,7 +229,7 @@ * "<" FormalTypeParameter+ ">" */ @@ -4446,8 +4518,8 @@ ets.add(parseThrowsSignature()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/registry/RegistryImpl.java 2014-11-28 15:55:01.093797806 +0000 @@ -78,9 +78,9 @@ /* indicate compatibility with JDK 1.1.x version of class */ private static final long serialVersionUID = 4666870661827494597L; @@ -4461,8 +4533,8 @@ private static ObjID id = new ObjID(ObjID.REGISTRY_ID); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/BatchEnvironment.java 2014-11-28 15:55:01.093797806 +0000 @@ -160,7 +160,7 @@ } @@ -4473,8 +4545,8 @@ /** * Remember a generated source file generated so that it diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/Main.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/Main.java 2014-11-28 15:55:01.093797806 +0000 @@ -184,7 +184,7 @@ destDir = null; flags = F_WARNINGS; @@ -4494,8 +4566,8 @@ // Pre-process command line for @file arguments try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/rmic/RMIGenerator.java 2014-11-28 15:55:01.093797806 +0000 @@ -61,7 +61,7 @@ */ public class RMIGenerator implements RMIConstants, Generator { @@ -4515,8 +4587,8 @@ uniqueList.addElement(defRuntimeException); uniqueList.addElement(defRemoteException); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2014-08-27 20:02:25.002206522 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2014-11-28 07:13:39.133924576 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2014-11-28 15:55:01.097797859 +0000 @@ -66,10 +66,10 @@ /** maps persistent IDs to activated remote objects */ @@ -4531,8 +4603,8 @@ /** * Creates a default activation group implementation. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2014-08-27 20:02:25.690216258 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Activation.java 2014-11-28 07:13:39.189925333 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Activation.java 2014-11-28 15:55:01.097797859 +0000 @@ -149,10 +149,10 @@ /** maps activation id to its respective group id */ @@ -4589,8 +4661,8 @@ /* * Parse arguments diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2014-08-27 20:02:25.002206522 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2014-11-28 07:13:39.133924576 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2014-11-28 15:55:01.097797859 +0000 @@ -113,11 +113,11 @@ * garbage collected. */ @@ -4615,8 +4687,8 @@ /** * Convert an array of URL objects into a corresponding string diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/MarshalInputStream.java 2014-11-28 15:55:01.097797859 +0000 @@ -71,14 +71,14 @@ /** table to hold sun classes to which access is explicitly permitted */ @@ -4635,8 +4707,8 @@ /** * if true, load classes (if not available locally) only from the diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/UnicastServerRef.java 2014-11-28 15:55:01.097797859 +0000 @@ -537,7 +537,7 @@ HashToMethod_Maps() {} @@ -4647,8 +4719,8 @@ cl != null; cl = cl.getSuperclass()) diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/Util.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/Util.java 2014-11-28 15:55:01.097797859 +0000 @@ -207,7 +207,7 @@ * @throws NullPointerException if remoteClass is null */ @@ -4659,8 +4731,8 @@ return list.toArray(new Class<?>[list.size()]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/WeakClassHashMap.java 2014-11-28 15:55:01.097797859 +0000 @@ -46,7 +46,7 @@ **/ public abstract class WeakClassHashMap<V> { @@ -4671,8 +4743,8 @@ protected WeakClassHashMap() { } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ConnectionInputStream.java 2014-11-28 15:55:01.097797859 +0000 @@ -43,7 +43,7 @@ private boolean dgcAckNeeded = false; @@ -4683,8 +4755,8 @@ /** identifier for gc ack*/ private UID ackID; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCAckHandler.java 2014-11-28 15:55:01.097797859 +0000 @@ -78,7 +78,7 @@ Collections.synchronizedMap(new HashMap<UID,DGCAckHandler>()); @@ -4695,8 +4767,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2014-08-27 20:14:12.756189112 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCClient.java 2014-11-28 15:55:01.097797859 +0000 @@ -176,9 +176,9 @@ private DGC dgc; @@ -4768,8 +4840,8 @@ private boolean dirtyFailed = false; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/DGCImpl.java 2014-11-28 15:55:01.097797859 +0000 @@ -84,7 +84,7 @@ /** remote implementation of DGC interface for this VM */ private static DGCImpl dgc; @@ -4798,8 +4870,8 @@ LeaseInfo(VMID vmid, long lease) { this.vmid = vmid; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/ObjectTable.java 2014-11-28 15:55:01.097797859 +0000 @@ -62,9 +62,9 @@ /** tables mapping to Target, keyed from ObjectEndpoint and impl object */ @@ -4822,8 +4894,8 @@ /** handle for GC latency request (for future cancellation) */ private static GC.LatencyRequest gcLatencyRequest = null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/CGIHandler.java 2014-11-28 15:55:01.097797859 +0000 @@ -116,7 +116,7 @@ /* construct table mapping command strings to handlers */ private static Hashtable<String, CGICommandHandler> commandLookup; @@ -4834,8 +4906,8 @@ commandLookup.put(commands[i].getName(), commands[i]); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2014-08-27 20:02:25.690216258 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2014-11-28 07:13:39.189925333 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java 2014-11-28 15:55:01.097797859 +0000 @@ -75,13 +75,13 @@ /** table of hosts successfully connected to and the factory used */ @@ -4862,8 +4934,8 @@ try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Target.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Target.java 2014-11-28 15:55:01.097797859 +0000 @@ -53,10 +53,10 @@ /** stub for remote object */ private final Remote stub; @@ -4878,8 +4950,8 @@ private final AccessControlContext acc; /** context class loader in which target was created */ diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/ConnectionMultiplexer.java 2014-11-28 15:55:01.097797859 +0000 @@ -85,7 +85,7 @@ private DataOutputStream dataOut; @@ -4890,8 +4962,8 @@ /** number of currently open connections */ private int numConnections = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPChannel.java 2014-11-28 15:55:01.097797859 +0000 @@ -64,7 +64,7 @@ private final TCPTransport tr; /** list of cached connections */ @@ -4911,8 +4983,8 @@ /** thread ID counter */ private static int threadNum = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2014-08-27 20:02:25.002206522 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2014-11-28 07:13:39.137924630 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPEndpoint.java 2014-11-28 15:55:01.097797859 +0000 @@ -148,7 +148,7 @@ // TBD: should this be a weak hash table? private static final @@ -4923,8 +4995,8 @@ /** * Create an endpoint for a specified host and port. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/tcp/TCPTransport.java 2014-11-28 15:55:01.101797913 +0000 @@ -120,7 +120,7 @@ /** client host for the current thread's connection */ @@ -4944,8 +5016,8 @@ static final RMISocketFactory defaultSocketFactory = RMISocketFactory.getDefaultSocketFactory(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/Transport.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/rmi/transport/Transport.java 2014-11-28 15:55:01.101797913 +0000 @@ -62,7 +62,7 @@ Log.getLog("sun.rmi.transport.misc", "transport", Transport.logLevel); @@ -4956,8 +5028,8 @@ /** ObjID for DGCImpl */ private static final ObjID dgcID = new ObjID(ObjID.DGC_ID); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclEntryImpl.java 2014-11-28 15:55:01.101797913 +0000 @@ -37,7 +37,7 @@ */ public class AclEntryImpl implements AclEntry { @@ -4968,8 +5040,8 @@ /** diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/AclImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/AclImpl.java 2014-11-28 15:55:01.101797913 +0000 @@ -41,15 +41,15 @@ // or principal. // @@ -5010,8 +5082,8 @@ while (e1.hasMoreElements()) v.addElement(e1.nextElement()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/acl/GroupImpl.java 2014-11-28 15:55:01.101797913 +0000 @@ -34,7 +34,7 @@ * @author Satish Dharmaraj */ @@ -5031,8 +5103,8 @@ } } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/ProviderList.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/ProviderList.java 2014-11-28 15:55:01.101797913 +0000 @@ -96,7 +96,7 @@ if (providerList.getProvider(p.getName()) != null) { return providerList; @@ -5070,8 +5142,8 @@ ids.add(new ServiceId(type, alg)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jca/Providers.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jca/Providers.java 2014-11-28 15:55:01.101797913 +0000 @@ -40,7 +40,7 @@ public class Providers { @@ -5082,20 +5154,20 @@ // number of threads currently using thread-local provider lists // tracked to allow an optimization if == 0 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2014-08-27 20:14:12.760189167 +0100 -@@ -267,7 +267,7 @@ - if (ktabs.isEmpty()) { - return kk.toArray(new KerberosKey[kk.size()]); - } else { +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/jgss/krb5/Krb5Util.java 2014-11-28 15:59:55.149730268 +0000 +@@ -251,7 +251,7 @@ + } + + public KerberosKey[] getKKeys() { - List<KerberosKey> keys = new ArrayList<>(); + List<KerberosKey> keys = new ArrayList<KerberosKey>(); - for (KeyTab ktab: ktabs) { - for (KerberosKey k: ktab.getKeys(kp)) { - keys.add(k); + for (KerberosKey k: kk) { + keys.add(k); + } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Config.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Config.java 2014-11-28 15:55:01.101797913 +0000 @@ -576,7 +576,7 @@ } }))); @@ -5173,8 +5245,8 @@ for (int i = 0; i < len; i++) { type = getType(st.nextToken()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/Authenticator.java 2014-11-28 15:55:01.101797913 +0000 @@ -176,7 +176,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5185,8 +5257,8 @@ temp.putInteger(BigInteger.valueOf(authenticator_vno)); v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), temp.toByteArray())); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2014-08-27 20:14:12.760189167 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/AuthorizationData.java 2014-11-28 15:55:01.101797913 +0000 @@ -99,7 +99,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5197,9 +5269,9 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2014-08-27 20:14:12.760189167 +0100 -@@ -542,7 +542,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ccache/FileCredentialsCache.java 2014-11-28 15:55:01.101797913 +0000 +@@ -543,7 +543,7 @@ private static String exec(String c) { StringTokenizer st = new StringTokenizer(c); @@ -5209,8 +5281,8 @@ v.addElement(st.nextToken()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java 2014-11-28 15:55:01.101797913 +0000 @@ -257,7 +257,7 @@ + configName); } @@ -5221,8 +5293,8 @@ if (EncryptionKey.findKey(answer[i], keys) != null) { list.add(answer[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/EncAPRepPart.java 2014-11-28 15:55:01.101797913 +0000 @@ -133,7 +133,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5233,8 +5305,8 @@ v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte) 0x00), ctime.asn1Encode())); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/HostAddresses.java 2014-11-28 15:55:01.101797913 +0000 @@ -179,7 +179,7 @@ */ public HostAddresses(DerValue encoding) @@ -5254,8 +5326,8 @@ for (int i = 0; i < addresses.length; i++) { try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReqBody.java 2014-11-28 15:55:01.101797913 +0000 @@ -158,7 +158,7 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } @@ -5284,8 +5356,8 @@ if (msgType == Krb5.KRB_AS_REQ) { if (cname != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KDCReq.java 2014-11-28 15:55:01.101797913 +0000 @@ -150,7 +150,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -5296,8 +5368,8 @@ v.addElement(new PAData(subsubDer.getData().getDerValue())); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KrbCredInfo.java 2014-11-28 15:55:01.101797913 +0000 @@ -157,7 +157,7 @@ * @exception IOException if an I/O error occurs while reading encoded data. */ @@ -5308,8 +5380,8 @@ if (prealm != null) v.addElement(new DerValue(DerValue.createTag(DerValue.TAG_CONTEXT, true, (byte)0x01), prealm.asn1Encode())); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBCred.java 2014-11-28 15:55:01.101797913 +0000 @@ -134,7 +134,7 @@ if (subsubDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -5320,8 +5392,8 @@ v.addElement(new Ticket(subsubDer.getData().getDerValue())); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/KRBError.java 2014-11-28 15:55:01.101797913 +0000 @@ -259,7 +259,7 @@ private void parsePAData(byte[] data) throws IOException, Asn1Exception { @@ -5332,8 +5404,8 @@ // read the PA-DATA DerValue tmp = derPA.data.getDerValue(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2014-08-27 20:02:28.106250448 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2014-11-28 07:13:39.189925333 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/ktab/KeyTab.java 2014-11-28 15:55:01.105797966 +0000 @@ -67,7 +67,7 @@ // Attention: Currently there is no way to remove a keytab from this map, @@ -5371,8 +5443,8 @@ for (int i = entries.size()-1; i >= 0; i--) { KeyTabEntry e = entries.get(i); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/internal/LastReq.java 2014-11-28 15:55:01.105797966 +0000 @@ -77,7 +77,7 @@ */ @@ -5383,8 +5455,8 @@ throw new Asn1Exception(Krb5.ASN1_BAD_ID); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/KdcComm.java 2014-11-28 15:55:01.105797966 +0000 @@ -466,7 +466,7 @@ */ static class KdcAccessibility { @@ -5407,8 +5479,8 @@ String t = st.nextToken(); if (bads.contains(t)) badkdcs.add(t); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/PrincipalName.java 2014-11-28 15:55:01.105797966 +0000 @@ -238,7 +238,7 @@ if (subDer.getTag() != DerValue.tag_SequenceOf) { throw new Asn1Exception(Krb5.ASN1_BAD_ID); @@ -5428,8 +5500,8 @@ int i = 0; int componentStart = 0; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/krb5/Realm.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/krb5/Realm.java 2014-11-28 15:55:01.105797966 +0000 @@ -368,7 +368,7 @@ return null; } @@ -5449,8 +5521,8 @@ // Un-common ones for client side for (int i=0; i<=cPos; i++) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/certpath/DistributionPointFetcher.java 2014-11-28 15:55:01.105797966 +0000 @@ -584,7 +584,7 @@ // Except the performance improvement, another benefit is to break // the dead loop while looking for the issuer back and forth @@ -5461,8 +5533,8 @@ if (prevKey != null) { // Add the previous certificate as a trust anchor. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/JavaKeyStore.java 2014-11-28 15:55:01.105797966 +0000 @@ -683,7 +683,7 @@ // Read the certificate chain int numOfCerts = dis.readInt(); @@ -5473,8 +5545,8 @@ for (int j = 0; j < numOfCerts; j++) { if (xVersion == 2) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/PolicyFile.java 2014-11-28 15:55:01.105797966 +0000 @@ -299,7 +299,7 @@ private static final int DEFAULT_CACHE_SIZE = 1; @@ -5530,8 +5602,8 @@ while (i < certs.length) { signerCerts.add(certs[i]); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/Sun.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/Sun.java 2014-11-28 15:55:01.105797966 +0000 @@ -55,7 +55,7 @@ SunEntries.putEntries(this); } else { @@ -5542,8 +5614,8 @@ AccessController.doPrivileged(new PutAllAction(this, map)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/VerificationProvider.java 2014-11-28 15:55:01.105797966 +0000 @@ -76,7 +76,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -5554,8 +5626,8 @@ SunRsaSignEntries.putEntries(map); AccessController.doPrivileged(new PutAllAction(this, map)); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2014-08-27 20:14:12.764189224 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/provider/X509Factory.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/provider/X509Factory.java 2014-11-28 15:55:01.105797966 +0000 @@ -409,10 +409,10 @@ parseX509orPKCS7Cert(InputStream is) throws CertificateException, IOException @@ -5601,8 +5673,8 @@ } catch (ParsingException e) { while (data != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2014-08-27 20:14:55.084785772 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/RSACore.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/RSACore.java 2014-11-28 15:55:01.105797966 +0000 @@ -57,7 +57,7 @@ // use a weak hashmap so that cached values are automatically cleared // when the modulus is GC'ed @@ -5613,8 +5685,8 @@ private RSACore() { // empty diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2014-08-27 20:14:12.768189282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/rsa/SunRsaSign.java 2014-11-28 15:55:01.105797966 +0000 @@ -52,7 +52,7 @@ SunRsaSignEntries.putEntries(this); } else { @@ -5625,8 +5697,8 @@ AccessController.doPrivileged(new PutAllAction(this, map)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2014-08-27 20:14:12.768189282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/CipherSuite.java 2014-11-28 15:55:01.105797966 +0000 @@ -397,7 +397,7 @@ // Map BulkCipher -> Boolean(available) @@ -5637,9 +5709,9 @@ // descriptive name including key size, e.g. AES/128 final String description; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2014-08-27 20:14:12.768189282 +0100 -@@ -659,7 +659,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ClientHandshaker.java 2014-11-28 15:55:01.105797966 +0000 +@@ -719,7 +719,7 @@ if (certRequest != null) { X509ExtendedKeyManager km = sslContext.getX509KeyManager(); @@ -5648,7 +5720,7 @@ for (int i = 0; i < certRequest.types.length; i++) { String typeName; -@@ -1179,7 +1179,7 @@ +@@ -1260,7 +1260,7 @@ "Can't reuse existing SSL client session"); } @@ -5657,7 +5729,7 @@ cipherList.add(sessionSuite); if (!secureRenegotiation && cipherSuites.contains(CipherSuite.C_SCSV)) { -@@ -1197,7 +1197,7 @@ +@@ -1278,7 +1278,7 @@ // exclude SCSV for secure renegotiation if (secureRenegotiation && cipherSuites.contains(CipherSuite.C_SCSV)) { Collection<CipherSuite> cipherList = @@ -5667,8 +5739,8 @@ if (suite != CipherSuite.C_SCSV) { cipherList.add(suite); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2014-08-27 20:14:12.768189282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HandshakeMessage.java 2014-11-28 15:55:01.105797966 +0000 @@ -260,7 +260,7 @@ // add server_name extension void addServerNameIndicationExtension(String hostname) { @@ -5706,9 +5778,9 @@ private static void digestKey(MessageDigest md, SecretKey key) { try { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-08-27 20:02:25.002206522 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-08-27 20:14:12.768189282 +0100 -@@ -569,7 +569,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-11-28 07:13:39.137924630 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/Handshaker.java 2014-11-28 15:59:39.229515109 +0000 +@@ -579,7 +579,7 @@ activeProtocols = getActiveProtocols(); } @@ -5717,18 +5789,18 @@ if (!(activeProtocols.collection().isEmpty()) && activeProtocols.min.v != ProtocolVersion.NONE.v) { for (CipherSuite suite : enabledCipherSuites.collection()) { -@@ -614,7 +614,7 @@ - */ +@@ -625,7 +625,7 @@ ProtocolList getActiveProtocols() { if (activeProtocols == null) { + boolean enabledSSL20Hello = false; - ArrayList<ProtocolVersion> protocols = new ArrayList<>(4); + ArrayList<ProtocolVersion> protocols = new ArrayList<ProtocolVersion>(4); for (ProtocolVersion protocol : enabledProtocols.collection()) { - boolean found = false; - for (CipherSuite suite : enabledCipherSuites.collection()) { + // Need not to check the SSL20Hello protocol. + if (protocol.v == ProtocolVersion.SSL20Hello.v) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2014-08-27 20:02:19.874133954 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2014-08-27 20:14:12.768189282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2014-11-28 07:13:36.577890017 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/HelloExtensions.java 2014-11-28 15:55:01.109798018 +0000 @@ -169,7 +169,7 @@ return name; } @@ -5748,8 +5820,8 @@ list.add(toString(format)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2014-08-27 20:14:12.768189282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ProtocolList.java 2014-11-28 15:55:01.109798018 +0000 @@ -79,7 +79,7 @@ throw new IllegalArgumentException("Protocols may not be null"); } @@ -5760,8 +5832,8 @@ ProtocolVersion version = ProtocolVersion.valueOf(names[i]); if (versions.contains(version) == false) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2014-08-27 20:14:12.768189282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SignatureAndHashAlgorithm.java 2014-11-28 15:55:01.109798018 +0000 @@ -156,7 +156,7 @@ static Collection<SignatureAndHashAlgorithm> getSupportedAlgorithms(AlgorithmConstraints constraints) { @@ -5799,8 +5871,8 @@ for (SignatureAndHashAlgorithm sigAlg : algorithms) { if (sigAlg.hash.value > 0) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2014-08-27 20:14:12.768189282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLAlgorithmConstraints.java 2014-11-28 15:55:01.109798018 +0000 @@ -261,7 +261,7 @@ protected Set<String> decomposes(KeyExchange keyExchange, @@ -5847,8 +5919,8 @@ if(cipherSuite.keyExchange != null) { components.addAll( diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2014-08-27 20:14:12.768189282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLContextImpl.java 2014-11-28 15:55:01.109798018 +0000 @@ -331,7 +331,7 @@ Collection<CipherSuite> allowedCipherSuites = CipherSuite.allowedCipherSuites(); @@ -5877,9 +5949,9 @@ if ((certs != null) && (certs.length > 0)){ Collections.addAll(trustedCerts, certs); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2014-08-27 20:14:12.768189282 +0100 -@@ -618,7 +618,7 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSessionImpl.java 2014-11-28 15:55:01.109798018 +0000 +@@ -642,7 +642,7 @@ * key and the calling security context. This is important since * sessions can be shared across different protection domains. */ @@ -5888,7 +5960,7 @@ /** * Assigns a session value. Session change events are given if -@@ -686,7 +686,7 @@ +@@ -710,7 +710,7 @@ */ public String[] getValueNames() { Enumeration<SecureKey> e; @@ -5898,8 +5970,8 @@ Object securityCtx = SecureKey.getCurrentSecurityContext(); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2014-08-27 20:14:12.768189282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java 2014-11-28 15:55:01.109798018 +0000 @@ -2494,7 +2494,7 @@ entrySet, HandshakeCompletedEvent e) { @@ -5910,8 +5982,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2014-08-27 20:14:12.768189282 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/SunX509KeyManagerImpl.java 2014-11-28 15:55:01.109798018 +0000 @@ -337,7 +337,7 @@ X500Principal[] x500Issuers = (X500Principal[])issuers; @@ -5931,8 +6003,8 @@ Principal p = principals[i]; if (p instanceof X500Principal) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-08-27 20:14:12.772189339 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-11-28 15:55:01.109798018 +0000 @@ -134,7 +134,7 @@ FileInputStream fis = null; String defaultTrustStoreType; @@ -5943,8 +6015,8 @@ KeyStore ks = null; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2014-08-27 20:14:12.772189339 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/X509KeyManagerImpl.java 2014-11-28 15:55:01.109798018 +0000 @@ -307,7 +307,7 @@ (keyTypes.length == 0) || (keyTypes[0] == null)) { return null; @@ -5964,8 +6036,8 @@ return null; } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2014-08-27 20:14:12.772189339 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/JarSigner.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/JarSigner.java 2014-11-28 15:55:01.109798018 +0000 @@ -120,14 +120,14 @@ boolean token = false; // token-based keystore String jarfile; // jar files to sign or verify @@ -6047,8 +6119,8 @@ KeyStore caks = KeyTool.getCacertsKeyStore(); if (caks != null) { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2014-08-27 20:02:28.430255033 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2014-08-27 20:14:12.772189339 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/KeyTool.java 2014-11-28 07:13:39.193925387 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/KeyTool.java 2014-11-28 15:55:01.113798071 +0000 @@ -154,11 +154,11 @@ private KeyStore caks = null; // "cacerts" keystore private char[] srcstorePass = null; @@ -6119,8 +6191,8 @@ } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2014-08-27 20:14:12.772189339 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/tools/policytool/PolicyTool.java 2014-11-28 15:55:01.113798071 +0000 @@ -643,7 +643,7 @@ Class<?> pc = Class.forName(type, true, Thread.currentThread().getContextClassLoader()); @@ -6158,8 +6230,8 @@ super(i, b); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2014-08-27 20:02:28.430255033 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2014-08-27 20:14:12.772189339 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2014-11-28 07:13:39.193925387 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/util/UntrustedCertificates.java 2014-11-28 15:55:01.113798071 +0000 @@ -42,7 +42,7 @@ */ public final class UntrustedCertificates { @@ -6170,8 +6242,8 @@ /** * Checks if a certificate is untrusted. diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2014-08-27 20:14:12.772189339 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java 2014-11-28 15:55:01.113798071 +0000 @@ -1253,7 +1253,7 @@ if (exts == null) { return null; @@ -6219,8 +6291,8 @@ namesCopy.add(Collections.unmodifiableList(nameEntryCopy)); } else { diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2014-08-27 20:14:12.772189339 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2014-11-28 15:55:01.113798071 +0000 @@ -352,7 +352,7 @@ if (extensions == null) { return null; @@ -6249,8 +6321,8 @@ map.put(ext.getId(), ext); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2014-08-27 20:14:12.772189339 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2014-11-28 15:55:01.113798071 +0000 @@ -104,8 +104,8 @@ private X500Principal issuerPrincipal = null; private Date thisUpdate = null; @@ -6281,8 +6353,8 @@ if (!ex.isCritical()) { extSet.add(ex.getExtensionId().toString()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2014-08-27 20:14:12.772189339 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/tools/native2ascii/Main.java 2014-11-28 15:55:01.113798071 +0000 @@ -95,7 +95,7 @@ * Run the converter */ @@ -6293,8 +6365,8 @@ boolean createOutputFile = false; diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/InternalLocaleBuilder.java 2014-11-28 15:55:01.113798071 +0000 @@ -113,7 +113,7 @@ } // Use case insensitive string to prevent duplication @@ -6409,8 +6481,8 @@ ukeywords.put(key, type); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LanguageTag.java 2014-11-28 15:55:01.113798071 +0000 @@ -62,7 +62,7 @@ // Map contains grandfathered tags and its preferred mappings from // http://www.ietf.org/rfc/rfc5646.txt @@ -6466,8 +6538,8 @@ extensions.add(locextKey.toString() + SEP + ext.getValue()); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleExtensions.java 2014-11-28 15:55:01.113798071 +0000 @@ -81,7 +81,7 @@ } @@ -6495,8 +6567,8 @@ String key = LocaleUtils.toLowerString(kwd.getKey().value()); String type = LocaleUtils.toLowerString(kwd.getValue()); diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/locale/LocaleObjectCache.java 2014-11-28 15:55:01.113798071 +0000 @@ -38,14 +38,14 @@ public abstract class LocaleObjectCache<K, V> { @@ -6514,7 +6586,7 @@ } public V get(K key) { -@@ -64,7 +64,7 @@ +@@ -66,7 +66,7 @@ return null; } @@ -6523,7 +6595,7 @@ entry = map.putIfAbsent(key, newEntry); if (entry == null) { -@@ -81,7 +81,7 @@ +@@ -83,7 +83,7 @@ } protected V put(K key, V value) { @@ -6533,8 +6605,8 @@ return (oldEntry == null) ? null : oldEntry.get(); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/LocaleServiceProviderPool.java 2014-11-28 15:55:01.113798071 +0000 @@ -59,7 +59,7 @@ * set of provider implementations of a particular locale sensitive service. */ @@ -6554,8 +6626,8 @@ tmpList.add(getLookupLocale(locale)); } diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java ---- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/classes/sun/util/logging/PlatformLogger.java 2014-11-28 15:55:01.113798071 +0000 @@ -187,7 +187,7 @@ // Table of known loggers. Maps names to PlatformLoggers. @@ -6575,8 +6647,8 @@ return log; } diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/Demo.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/Demo.java 2014-11-28 15:55:01.113798071 +0000 @@ -160,7 +160,7 @@ } @@ -6611,8 +6683,8 @@ openwrite.add(WRITE); diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipCoder.java 2014-11-28 15:55:01.117798125 +0000 @@ -142,8 +142,8 @@ return new ZipCoder(Charset.defaultCharset()); } @@ -6625,8 +6697,8 @@ private CharsetDecoder decoder() { CharsetDecoder dec = decTL.get(); diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileAttributeView.java 2014-11-28 15:55:01.117798125 +0000 @@ -134,7 +134,7 @@ throws IOException { @@ -6637,8 +6709,8 @@ for (AttrID id : AttrID.values()) { try { diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystem.java 2014-11-28 15:55:01.117798125 +0000 @@ -157,7 +157,7 @@ @Override @@ -6739,8 +6811,8 @@ inodes.put(root, root); dirs.add(root); diff -Nru openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java ---- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/share/demo/nio/zipfs/src/com/sun/nio/zipfs/ZipFileSystemProvider.java 2014-11-28 15:55:01.117798125 +0000 @@ -62,7 +62,7 @@ public class ZipFileSystemProvider extends FileSystemProvider { @@ -6751,8 +6823,8 @@ public ZipFileSystemProvider() {} diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java ---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/java/lang/ProcessEnvironment.java 2014-11-28 15:55:01.117798125 +0000 @@ -68,7 +68,7 @@ // We cache the C environment. This means that subsequent calls // to putenv/setenv from C will not be visible from Java code. @@ -6763,8 +6835,8 @@ // so that earlier variables override later ones. for (int i = environ.length-1; i > 0; i-=2) diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java ---- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2014-08-27 20:02:28.810260410 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2014-11-28 07:13:39.193925387 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/java/util/prefs/FileSystemPreferences.java 2014-11-28 15:55:01.117798125 +0000 @@ -354,7 +354,7 @@ * log against that map. The resulting map is then written back * to the disk. @@ -6829,8 +6901,8 @@ } if (!changeLog.isEmpty()) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-08-27 20:14:12.776189394 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-11-28 15:55:01.117798125 +0000 @@ -60,7 +60,7 @@ int maxperkeyword, int maxkeywords) @@ -6850,8 +6922,8 @@ if (domain != null && domain.length() > 0) { sl.add(domain); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java 2014-11-28 15:55:01.117798125 +0000 @@ -43,10 +43,10 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController { @@ -6866,8 +6938,8 @@ private static final JarFileFactory instance = new JarFileFactory(); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/DevPollArrayWrapper.java 2014-11-28 15:55:01.117798125 +0000 @@ -133,7 +133,7 @@ pollArrayAddress = pollArray.address(); wfd = init(); @@ -6878,8 +6950,8 @@ void initInterrupt(int fd0, int fd1) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollArrayWrapper.java 2014-11-28 15:55:01.117798125 +0000 @@ -136,7 +136,7 @@ // eventHigh needed when using file descriptors > 64k @@ -6890,8 +6962,8 @@ void initInterrupt(int fd0, int fd1) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/EPollSelectorImpl.java 2014-11-28 15:55:01.117798125 +0000 @@ -67,7 +67,7 @@ fd1 = (int) pipeFds; pollWrapper = new EPollArrayWrapper(); @@ -6902,8 +6974,8 @@ protected int doSelect(long timeout) throws IOException { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/ch/SctpNet.java 2014-11-28 15:55:01.117798125 +0000 @@ -113,7 +113,7 @@ SocketAddress[] saa) { @@ -6914,8 +6986,8 @@ set.add(getRevealedLocalAddress(sa, sm)); } diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/cs/ext/CompoundTextSupport.java 2014-11-28 15:55:01.117798125 +0000 @@ -153,12 +153,12 @@ static { @@ -6934,8 +7006,8 @@ if (!(isEncodingSupported("US-ASCII") && isEncodingSupported("ISO-8859-1"))) diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxFileSystem.java 2014-11-28 15:55:01.117798125 +0000 @@ -53,7 +53,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -6955,8 +7027,8 @@ long fp = setmntent(fstab.getBytes(), "r".getBytes()); try { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/LinuxUserDefinedFileAttributeView.java 2014-11-28 15:55:01.117798125 +0000 @@ -63,7 +63,7 @@ // Parses buffer as array of NULL-terminated C strings. @@ -6967,8 +7039,8 @@ int pos = 0; while (pos < size) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisAclFileAttributeView.java 2014-11-28 15:55:01.117798125 +0000 @@ -198,7 +198,7 @@ * Decode the buffer, returning an ACL */ @@ -6979,8 +7051,8 @@ long offset = address + i*SIZEOF_ACE_T; diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisFileSystem.java 2014-11-28 15:55:01.117798125 +0000 @@ -76,7 +76,7 @@ static final Set<String> supportedFileAttributeViews = supportedFileAttributeViews(); @@ -7000,8 +7072,8 @@ UnixPath mnttab = new UnixPath(this, "/etc/mnttab"); long fp = fopen(mnttab, "r"); diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/SolarisUserDefinedFileAttributeView.java 2014-11-28 15:55:01.117798125 +0000 @@ -83,7 +83,7 @@ } @@ -7012,8 +7084,8 @@ byte[] name; while ((name = readdir(dp)) != null) { diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java ---- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/solaris/classes/sun/nio/fs/UnixFileAttributes.java 2014-11-28 15:55:01.117798125 +0000 @@ -194,7 +194,7 @@ @Override public Set<PosixFilePermission> permissions() { @@ -7024,8 +7096,8 @@ if ((bits & UnixConstants.S_IRUSR) > 0) perms.add(PosixFilePermission.OWNER_READ); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java ---- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/java/lang/ProcessEnvironment.java 2014-11-28 15:55:01.117798125 +0000 @@ -250,7 +250,8 @@ envblock.substring(eql+1,end)); } @@ -7047,8 +7119,8 @@ StringBuilder sb = new StringBuilder(size()*30); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java 2014-11-28 15:55:01.117798125 +0000 @@ -63,7 +63,7 @@ // Parse string that consists of token delimited by space or commas // and return LinkedHashMap @@ -7059,8 +7131,8 @@ // comma and space are valid delimites StringTokenizer st = new StringTokenizer(str, ", "); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsFileSystem.java 2014-11-28 15:55:01.121798178 +0000 @@ -128,7 +128,7 @@ } @@ -7071,8 +7143,8 @@ for (int i = 0; i <= 25; i++) { // 0->A, 1->B, 2->C... if ((drives & (1 << i)) != 0) { diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsPath.java 2014-11-28 15:55:01.121798178 +0000 @@ -575,7 +575,7 @@ // generate offset array private void initOffsets() { @@ -7083,8 +7155,8 @@ // empty path considered to have one name element list.add(0); diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsSecurityDescriptor.java 2014-11-28 15:55:01.121798178 +0000 @@ -378,7 +378,7 @@ AclInformation aclInfo = GetAclInformation(aclAddress); aceCount = aclInfo.aceCount(); @@ -7095,8 +7167,8 @@ // decode each of the ACEs to AclEntry objects for (int i=0; i<aceCount; i++) { diff -Nru openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java ---- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/src/windows/classes/sun/nio/fs/WindowsUserDefinedFileAttributeView.java 2014-11-28 15:55:01.121798178 +0000 @@ -65,7 +65,7 @@ // enumerates the file streams using FindFirstStream/FindNextStream APIs. @@ -7143,8 +7215,8 @@ opts.add(WindowsChannelFactory.OPEN_REPARSE_POINT); opts.add(CREATE); diff -Nru openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java ---- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/test/java/io/Serializable/NPEProvoker/NPEProvoker.java 2014-11-28 15:55:01.121798178 +0000 @@ -56,7 +56,7 @@ public static void main(String[] args) { System.err.println("\n Regression test for bug 6541870\n"); @@ -7155,8 +7227,8 @@ ByteArrayOutputStream baos = new ByteArrayOutputStream(); ObjectOutputStream oos = new ObjectOutputStream(baos); diff -Nru openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java ---- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2014-08-27 20:14:12.780189449 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/InjectBytecodes.java 2014-11-28 15:55:01.121798178 +0000 @@ -50,7 +50,7 @@ private final Injector[] after = new Injector[256]; private final String className; @@ -7167,8 +7239,8 @@ private int pos; private int newPos; diff -Nru openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java ---- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2014-08-27 20:14:12.784189506 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/instrument/ilib/Inject.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/instrument/ilib/Inject.java 2014-11-28 15:55:01.121798178 +0000 @@ -107,7 +107,7 @@ class IndexedInjector implements TrackerInjector { int counter = 0; @@ -7179,8 +7251,8 @@ public int stackSize(int currentSize) { return currentSize + 1; diff -Nru openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java ---- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2014-08-27 20:14:12.784189506 +0100 +--- openjdk-boot.orig/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/test/java/lang/reflect/Generics/TestPlainArrayNotGeneric.java 2014-11-28 15:55:01.121798178 +0000 @@ -103,7 +103,7 @@ } } @@ -7191,8 +7263,8 @@ private static void check(Type t, String what) { if (t == null || !checking.add(t)) diff -Nru openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java ---- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2014-08-27 20:14:12.784189506 +0100 +--- openjdk-boot.orig/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/test/java/util/logging/ClassLoaderLeakTest.java 2014-11-28 15:55:01.121798178 +0000 @@ -89,7 +89,7 @@ MyClassLoader appClassLoader = new MyClassLoader(urls, "test0"); @@ -7203,8 +7275,8 @@ Thread appThread = new Thread(appsThreadGroup, launcher, "AppThread-0"); diff -Nru openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java ---- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2014-08-27 18:40:41.000000000 +0100 -+++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2014-08-27 20:14:12.784189506 +0100 +--- openjdk-boot.orig/jdk/test/java/util/Random/DistinctSeeds.java 2014-11-28 03:10:26.000000000 +0000 ++++ openjdk-boot/jdk/test/java/util/Random/DistinctSeeds.java 2014-11-28 15:55:01.121798178 +0000 @@ -59,7 +59,7 @@ } } @@ -7214,63 +7286,3 @@ List<Thread> threads = new ArrayList<Thread>(); for (int i = 0; i < threadCount; i++) { RandomCollector r = new RandomCollector(); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/swing/JDesktopPane.java openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java ---- openjdk-boot.orig/jdk/src/share/classes/javax/swing/JDesktopPane.java 2014-10-16 16:01:29.000000000 +0100 -+++ openjdk-boot/jdk/src/share/classes/javax/swing/JDesktopPane.java 2014-10-16 16:53:18.417845002 +0100 -@@ -267,7 +267,7 @@ - - private static Collection<JInternalFrame> getAllFrames(Container parent) { - int i, count; -- Collection<JInternalFrame> results = new LinkedHashSet<>(); -+ Collection<JInternalFrame> results = new LinkedHashSet<JInternalFrame>(); - count = parent.getComponentCount(); - for (i = 0; i < count; i++) { - Component next = parent.getComponent(i); -diff -Nru openjdk-boot.orig/jdk/src/share/classes/jdk/net/Sockets.java openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java ---- openjdk-boot.orig/jdk/src/share/classes/jdk/net/Sockets.java 2014-10-16 20:15:06.087116645 +0100 -+++ openjdk-boot/jdk/src/share/classes/jdk/net/Sockets.java 2014-10-16 20:18:48.586149429 +0100 -@@ -58,7 +58,7 @@ - public class Sockets { - - private final static HashMap<Class<?>,Set<SocketOption<?>>> -- options = new HashMap<>(); -+ options = new HashMap<Class<?>,Set<SocketOption<?>>>(); - - static { - initOptionSets(); -@@ -351,7 +351,7 @@ - - // Socket - -- Set<SocketOption<?>> set = new HashSet<>(); -+ Set<SocketOption<?>> set = new HashSet<SocketOption<?>>(); - set.add(StandardSocketOptions.SO_KEEPALIVE); - set.add(StandardSocketOptions.SO_SNDBUF); - set.add(StandardSocketOptions.SO_RCVBUF); -@@ -367,7 +367,7 @@ - - // ServerSocket - -- set = new HashSet<>(); -+ set = new HashSet<SocketOption<?>>(); - set.add(StandardSocketOptions.SO_RCVBUF); - set.add(StandardSocketOptions.SO_REUSEADDR); - set = Collections.unmodifiableSet(set); -@@ -375,7 +375,7 @@ - - // DatagramSocket - -- set = new HashSet<>(); -+ set = new HashSet<SocketOption<?>>(); - set.add(StandardSocketOptions.SO_SNDBUF); - set.add(StandardSocketOptions.SO_RCVBUF); - set.add(StandardSocketOptions.SO_REUSEADDR); -@@ -388,7 +388,7 @@ - - // MulticastSocket - -- set = new HashSet<>(); -+ set = new HashSet<SocketOption<?>>(); - set.add(StandardSocketOptions.SO_SNDBUF); - set.add(StandardSocketOptions.SO_RCVBUF); - set.add(StandardSocketOptions.SO_REUSEADDR);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/pr64174.patch Thu Dec 04 19:46:52 2014 +0000 @@ -0,0 +1,21 @@ +diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties +--- openjdk-boot.orig/jdk/src/share/classes/java/util/CurrencyData.properties 2014-12-04 15:09:06.030312835 +0000 ++++ openjdk-boot/jdk/src/share/classes/java/util/CurrencyData.properties 2014-12-04 15:10:07.527160626 +0000 +@@ -320,7 +320,7 @@ + # LAO PEOPLE'S DEMOCRATIC REPUBLIC + LA=LAK + # LATVIA +-LV=LVL;2013-12-31-22-00-00;EUR ++LV=EUR + # LEBANON + LB=LBP + # LESOTHO +@@ -332,7 +332,7 @@ + # LIECHTENSTEIN + LI=CHF + # LITHUANIA +-LT=LTL;2014-12-31-22-00-00;EUR ++LT=LTL;2015-01-01-00-00-00;EUR + # LUXEMBOURG + LU=EUR + # MACAU