# HG changeset patch # User prr # Date 1396632251 25200 # Node ID 29dc629ec823a9ad8027c2ac0cb4048c875778b8 # Parent b813b1ee855d9371437f17c35e5e8402626ca15f# Parent 7d5147c219276e075c825e430e56512966fb14da Merge diff -r b813b1ee855d -r 29dc629ec823 .hgtags --- a/.hgtags Fri Apr 04 10:03:18 2014 -0700 +++ b/.hgtags Fri Apr 04 10:24:11 2014 -0700 @@ -248,3 +248,4 @@ 7f655f31f9bcee618cf832f08176ad8c1ed3fdd3 jdk9-b03 099891b1d86f3719e116ac717ffdafc90d037fb7 jdk9-b04 dd311791ad6895a3989020dd6c6c46db87972ab8 jdk9-b05 +85dbdc227c5e11429b4fc4a8ba763f50107edd6e jdk9-b06 diff -r b813b1ee855d -r 29dc629ec823 .hgtags-top-repo --- a/.hgtags-top-repo Fri Apr 04 10:03:18 2014 -0700 +++ b/.hgtags-top-repo Fri Apr 04 10:24:11 2014 -0700 @@ -248,3 +248,4 @@ fd8d51bdf9aadf7ae83e65e8655c53581017c363 jdk9-b03 cb4c3440bc2748101923e2488506e61009ab1bf5 jdk9-b04 8c63f0b6ada282f27e3a80125e53c3be603f9af7 jdk9-b05 +d0b525cd31b87abeb6d5b7e3516953eeb13b323c jdk9-b06 diff -r b813b1ee855d -r 29dc629ec823 corba/.hgtags --- a/corba/.hgtags Fri Apr 04 10:03:18 2014 -0700 +++ b/corba/.hgtags Fri Apr 04 10:24:11 2014 -0700 @@ -248,3 +248,4 @@ d338b892a13db19b093f85cf5f949a4504e4d31f jdk9-b03 1ed19de263e1e0772da0269118cdd9deeb9fff04 jdk9-b04 167c39eb44731a5d66770d0f00e231164653a2ff jdk9-b05 +a4bf701ac316946c2e5e83138ad8e687da6a4b30 jdk9-b06 diff -r b813b1ee855d -r 29dc629ec823 hotspot/.hgtags --- a/hotspot/.hgtags Fri Apr 04 10:03:18 2014 -0700 +++ b/hotspot/.hgtags Fri Apr 04 10:24:11 2014 -0700 @@ -408,3 +408,4 @@ b2fee789d23f3cdabb3db4e51af43038e5692d3a jdk9-b03 3812c088b9456ee22c933e88aee1ece71f4e783a jdk9-b04 bdc5311e1db7598589b77015119b821bf8c828bd jdk9-b05 +52377a30a3f87b62d6135706997b8c7a47366e37 jdk9-b06 diff -r b813b1ee855d -r 29dc629ec823 jaxp/.hgtags --- a/jaxp/.hgtags Fri Apr 04 10:03:18 2014 -0700 +++ b/jaxp/.hgtags Fri Apr 04 10:24:11 2014 -0700 @@ -248,3 +248,4 @@ fb92ed0399424193f444489ad49a16748816dc12 jdk9-b03 2846d8fc31490897817a122a668af4f44fc913d0 jdk9-b04 b92a20e303d24c74078888cd7084b14d7626d48f jdk9-b05 +46e4951b2a267e98341613a3b796f2c7554eb831 jdk9-b06 diff -r b813b1ee855d -r 29dc629ec823 jaxws/.hgtags --- a/jaxws/.hgtags Fri Apr 04 10:03:18 2014 -0700 +++ b/jaxws/.hgtags Fri Apr 04 10:24:11 2014 -0700 @@ -251,3 +251,4 @@ 1cd9786257ed4f82a3371fd606b162e5bb6fcd81 jdk9-b03 da44a8bdf1f3fdd518e7d785d60cc1b15983b176 jdk9-b04 eae966c8133fec0a8bf9e16d1274a4ede3c0fb52 jdk9-b05 +cf0a6e41670f990414cd337000ad5f3bd1908073 jdk9-b06 diff -r b813b1ee855d -r 29dc629ec823 jdk/.hgtags --- a/jdk/.hgtags Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/.hgtags Fri Apr 04 10:24:11 2014 -0700 @@ -248,3 +248,4 @@ 4111af6151ed8ca8e3f5603c69729a68427e1d5b jdk9-b03 627deed79b595a4789fc9151455b663a47381257 jdk9-b04 263198a1d8f1f4cb97d35f40c61704b08ebd3686 jdk9-b05 +cac7b28b8b1e0e11d7a8e1ac1fe75a03b3749eab jdk9-b06 diff -r b813b1ee855d -r 29dc629ec823 jdk/make/Setup.gmk --- a/jdk/make/Setup.gmk Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/make/Setup.gmk Fri Apr 04 10:24:11 2014 -0700 @@ -27,7 +27,7 @@ # To build with all warnings enabled, do the following: # make JAVAC_WARNINGS="-Xlint:all -Xmaxwarns 10000" -JAVAC_WARNINGS := -Xlint:-unchecked,-deprecation,-overrides,auxiliaryclass,cast,classfile,dep-ann,divzero,empty,overloads,static,try,varargs -Werror +JAVAC_WARNINGS := -Xlint:-unchecked,-deprecation,-overrides,auxiliaryclass,cast,classfile,dep-ann,divzero,empty,overloads,serial,static,try,varargs -Werror # Any java code executed during a JDK build to build other parts of the JDK must be # executed by the bootstrap JDK (probably with -Xbootclasspath/p: ) and for this diff -r b813b1ee855d -r 29dc629ec823 jdk/make/data/tzdata/VERSION --- a/jdk/make/data/tzdata/VERSION Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/make/data/tzdata/VERSION Fri Apr 04 10:24:11 2014 -0700 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2014a +tzdata2014b diff -r b813b1ee855d -r 29dc629ec823 jdk/make/data/tzdata/africa --- a/jdk/make/data/tzdata/africa Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/make/data/tzdata/africa Fri Apr 04 10:24:11 2014 -0700 @@ -891,7 +891,10 @@ # Another source (specifying the time for start and end in the decree): # http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html -# From Paul Eggert (2013-10-03): +# From Sebastien Willemijns (2014-03-18): +# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp + +# From Paul Eggert (2014-03-19): # To estimate what the Moroccan government will do in future years, # transition dates for 2014 through 2038 were determined by running # the following program under GNU Emacs 24.3: diff -r b813b1ee855d -r 29dc629ec823 jdk/make/data/tzdata/antarctica --- a/jdk/make/data/tzdata/antarctica Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/make/data/tzdata/antarctica Fri Apr 04 10:24:11 2014 -0700 @@ -253,24 +253,41 @@ # year-round base # Scott Base, Ross Island, since 1957-01. # See Pacific/Auckland. -# -# These rules for New Zealand are stolen from the 'australasia' file. -# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D -Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D -Rule NZAQ 1989 only - Oct 8 2:00s 1:00 D -Rule NZAQ 1990 2006 - Oct Sun>=1 2:00s 1:00 D -Rule NZAQ 1975 only - Feb 23 2:00s 0 S -Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S -Rule NZAQ 1990 2007 - Mar Sun>=15 2:00s 0 S -Rule NZAQ 2007 max - Sep lastSun 2:00s 1:00 D -Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S # Norway - territories # Bouvet (never inhabited) # # claims # Peter I Island (never inhabited) +# +# year-round base +# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12 +# +# From Paul-Inge Flakstad (2014-03-10): +# I recently had a long dialog about this with the developer of timegenie.com. +# In the absence of specific dates, he decided to choose some likely ones: +# GMT +1 - From March 1 to the last Sunday in March +# GMT +2 - From the last Sunday in March until the last Sunday in October +# GMT +1 - From the last Sunday in October until November 7 +# GMT +0 - From November 7 until March 1 +# The dates for switching to and from UTC+0 will probably not be absolutely +# correct, but they should be quite close to the actual dates. +# +# From Paul Eggert (2014-03-21): +# The CET-switching Troll rules require zic from tzcode 2014b or later, so as +# suggested by Bengt-Inge Larsson comment them out for now, and approximate +# with only UTC and CEST. Uncomment them when 2014b is more prevalent. +# +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +#Rule Troll 2005 max - Mar 1 1:00u 1:00 CET +Rule Troll 2005 max - Mar lastSun 1:00u 2:00 CEST +#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 CET +#Rule Troll 2004 max - Nov 7 1:00u 0:00 UTC +# Remove the following line when uncommenting the above '#Rule' lines. +Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Antarctica/Troll 0 - zzz 2005 Feb 12 + 0:00 Troll %s # Poland - year-round base # Arctowski, King George Island, -620945-0582745, since 1977 diff -r b813b1ee855d -r 29dc629ec823 jdk/make/data/tzdata/australasia --- a/jdk/make/data/tzdata/australasia Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/make/data/tzdata/australasia Fri Apr 04 10:24:11 2014 -0700 @@ -786,14 +786,29 @@ # Johnston # -# From Paul Eggert (2013-09-03): +# From Paul Eggert (2014-03-11): +# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind. +# Details are uncertain. We have no data for Johnston after 1970, so +# treat it like Hawaii for now. +# # In his memoirs of June 6th to October 4, 1945 # (2005), Herbert C. Bach writes, # "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM # Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and # confirms that Johnston kept the same time as Honolulu in summer 1945. -# We have no better information, so for now, assume this has been true -# indefinitely into the past. +# +# From Lyle McElhaney (2014-03-11): +# [W]hen JI was being used for that [atomic bomb] testing, the time being used +# was not Hawaiian time but rather the same time being used on the ships, +# which had a GMT offset of -11 hours. This apparently applied to at least the +# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last +# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin, +# "The United States High-Altitude Test Experience: A Review Emphasizing the +# Impact on the Environment", Los Alamos LA-6405, Oct 1976 +# . +# See the table on page 4 where he lists GMT and local times for the tests; a +# footnote for the JI tests reads that local time is "JI time = Hawaii Time +# Minus One Hour". # # See 'northamerica' for Pacific/Johnston. diff -r b813b1ee855d -r 29dc629ec823 jdk/make/data/tzdata/europe --- a/jdk/make/data/tzdata/europe Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/make/data/tzdata/europe Fri Apr 04 10:24:11 2014 -0700 @@ -2986,7 +2986,11 @@ # Assume it happened in March by not changing the clocks. 3:00 Russia MSK/MSD 1997 3:00 - MSK 1997 Mar lastSun 1:00u - 2:00 EU EE%sT +# From Alexander Krivenyshev (2014-03-17): +# time change at 2:00 (2am) on March 30, 2014 +# http://vz.ru/news/2014/3/17/677464.html + 2:00 EU EE%sT 2014 Mar 30 2:00 + 4:00 - MSK # Vatican City # See Europe/Rome. diff -r b813b1ee855d -r 29dc629ec823 jdk/make/data/tzdata/leapseconds --- a/jdk/make/data/tzdata/leapseconds Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/make/data/tzdata/leapseconds Fri Apr 04 10:24:11 2014 -0700 @@ -20,7 +20,7 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. - +# # Allowance for leapseconds added to each timezone file. # This file is in the public domain. diff -r b813b1ee855d -r 29dc629ec823 jdk/make/data/tzdata/zone.tab --- a/jdk/make/data/tzdata/zone.tab Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/make/data/tzdata/zone.tab Fri Apr 04 10:24:11 2014 -0700 @@ -74,6 +74,7 @@ AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I +AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF) AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN) @@ -366,6 +367,7 @@ RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia +RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk @@ -421,7 +423,6 @@ UA +5026+03031 Europe/Kiev most locations UA +4837+02218 Europe/Uzhgorod Ruthenia UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk -UA +4457+03406 Europe/Simferopol central Crimea UG +0019+03225 Africa/Kampala UM +1645-16931 Pacific/Johnston Johnston Atoll UM +2813-17722 Pacific/Midway Midway Islands diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java --- a/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java Fri Apr 04 10:24:11 2014 -0700 @@ -787,6 +787,14 @@ if (!reconnected) { try { NotificationResult nr = fetchNotifs(-1, 0, 0); + + if (state != STOPPED) { // JDK-8038940 + // reconnection must happen during + // fetchNotifs(-1, 0, 0), and a new + // thread takes over the fetching job + return; + } + clientSequenceNumber = nr.getNextSequenceNumber(); } catch (ClassNotFoundException e) { // can't happen diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/Enumerated.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/Enumerated.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/Enumerated.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,7 +45,7 @@ *

This API is a Sun Microsystems internal API and is subject * to change without notice.

*/ - +@SuppressWarnings("serial") // JDK implementation class abstract public class Enumerated implements Serializable { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Host.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Host.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/Host.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,6 +44,7 @@ * The class defines an abstract representation of a host. * */ +@SuppressWarnings("serial") // JDK implementation class abstract class Host extends SimpleNode implements Serializable { public Host(int id) { diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/SnmpPdu.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPdu.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/SnmpPdu.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,6 +45,7 @@ * * @since 1.5 */ +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpPdu implements SnmpDefinitions, Serializable { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduPacket.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduPacket.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/SnmpScopedPduPacket.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,6 +47,7 @@ * * @since 1.5 */ +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpScopedPduPacket extends SnmpPdu implements Serializable { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/SnmpUnsignedInt.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,7 +34,7 @@ *

This API is a Sun Microsystems internal API and is subject * to change without notice.

*/ - +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpUnsignedInt extends SnmpInt { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/SnmpValue.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/SnmpValue.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/SnmpValue.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -38,7 +38,7 @@ *

This API is a Sun Microsystems internal API and is subject * to change without notice.

*/ - +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpValue implements Cloneable, Serializable, SnmpDataTypeEnums { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMib.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,6 +59,7 @@ *

This API is a Sun Microsystems internal API and is subject * to change without notice.

*/ +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpMib extends SnmpMibAgent implements Serializable { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibAgent.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -59,7 +59,7 @@ *

This API is a Sun Microsystems internal API and is subject * to change without notice.

*/ - +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpMibAgent implements SnmpMibAgentMBean, MBeanRegistration, Serializable { diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -41,7 +41,7 @@ *

This API is a Sun Microsystems internal API and is subject * to change without notice.

*/ - +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpMibEntry extends SnmpMibNode implements Serializable { diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,7 +49,7 @@ *

This API is a Sun Microsystems internal API and is subject * to change without notice.

*/ - +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpMibGroup extends SnmpMibOid implements Serializable { diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -53,7 +53,7 @@ *

This API is a Sun Microsystems internal API and is subject * to change without notice.

*/ - +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpMibNode implements Serializable { // --------------------------------------------------------------------- diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -84,7 +84,7 @@ * @see com.sun.jmx.snmp.agent.SnmpTableSupport * */ - +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpMibTable extends SnmpMibNode implements NotificationBroadcaster, Serializable { diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableSupport.java --- a/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableSupport.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/com/sun/jmx/snmp/agent/SnmpTableSupport.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -80,6 +80,7 @@ * @see com.sun.jmx.snmp.agent.SnmpMibTable * */ +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpTableSupport implements SnmpTableEntryFactory, // NPCTE fix for bugId 4499265, esc 0, MR 04 sept 2001 // SnmpTableCallbackHandler { diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/BorderLayout.java --- a/jdk/src/share/classes/java/awt/BorderLayout.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/BorderLayout.java Fri Apr 04 10:24:11 2014 -0700 @@ -115,7 +115,7 @@ * } * } *
- *

+ * * @author Arthur van Hoff * @see java.awt.Container#add(String, Component) * @see java.awt.ComponentOrientation @@ -414,8 +414,7 @@ * the component is added to the layout. * @see java.awt.Container#add(java.awt.Component, java.lang.Object) * @exception IllegalArgumentException if the constraint object is not - * a string, or if it not one of the five specified - * constants. + * a string, or if it not one of the five specified constants. * @since JDK1.1 */ public void addLayoutComponent(Component comp, Object constraints) { diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/CheckboxGroup.java --- a/jdk/src/share/classes/java/awt/CheckboxGroup.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/CheckboxGroup.java Fri Apr 04 10:24:11 2014 -0700 @@ -49,7 +49,7 @@ * Shows three checkboxes, arranged vertically, labeled one, two, and three. Checkbox one is in the on state. - *

+ * * @author Sami Shaio * @see java.awt.Checkbox * @since JDK1.0 diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/Choice.java --- a/jdk/src/share/classes/java/awt/Choice.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/Choice.java Fri Apr 04 10:24:11 2014 -0700 @@ -65,7 +65,7 @@ * Native GUI Choice components' size are often bound by such * attributes as font size and length of items contained within * the Choice. - *

+ * * @author Sami Shaio * @author Arthur van Hoff * @since JDK1.0 diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/EventQueue.java --- a/jdk/src/share/classes/java/awt/EventQueue.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/EventQueue.java Fri Apr 04 10:24:11 2014 -0700 @@ -680,7 +680,7 @@ * No action (ignored) * * - *

+ * * @param event an instance of java.awt.AWTEvent, * or a subclass of it * @throws NullPointerException if event is null @@ -1015,7 +1015,6 @@ * methods to execute a task in * {@link Toolkit#getSystemEventQueue the current AWT EventQueue}'s * dispatch thread. - *

* * @return true if running in * {@link Toolkit#getSystemEventQueue the current AWT EventQueue}'s diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/GridBagLayoutInfo.java --- a/jdk/src/share/classes/java/awt/GridBagLayoutInfo.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/GridBagLayoutInfo.java Fri Apr 04 10:24:11 2014 -0700 @@ -29,7 +29,7 @@ * The {@code GridBagLayoutInfo} is an utility class for * {@code GridBagLayout} layout manager. * It stores align, size and baseline parameters for every component within a container. - *

+ * * @see java.awt.GridBagLayout * @see java.awt.GridBagConstraints * @since 1.6 diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/Robot.java --- a/jdk/src/share/classes/java/awt/Robot.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/Robot.java Fri Apr 04 10:24:11 2014 -0700 @@ -76,7 +76,6 @@ /** * Constructs a Robot object in the coordinate system of the primary screen. - *

* * @throws AWTException if the platform configuration does not allow * low-level input control. This exception is always thrown when diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/TextArea.java --- a/jdk/src/share/classes/java/awt/TextArea.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/TextArea.java Fri Apr 04 10:24:11 2014 -0700 @@ -49,7 +49,7 @@ * 

  * new TextArea("Hello", 5, 40);
  *
- *

+ * * @author Sami Shaio * @since JDK1.0 */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/Toolkit.java --- a/jdk/src/share/classes/java/awt/Toolkit.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/Toolkit.java Fri Apr 04 10:24:11 2014 -0700 @@ -2590,7 +2590,7 @@ * If not set by the time of the {@code Toolkit} class initialization, this property will be * initialized with {@code true}. * Changing this value after the {@code Toolkit} class initialization will have no effect. - *

+ * * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true * @return {@code true} if events from extra mouse buttons are allowed to be processed and posted; * {@code false} otherwise diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/TrayIcon.java --- a/jdk/src/share/classes/java/awt/TrayIcon.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/TrayIcon.java Fri Apr 04 10:24:11 2014 -0700 @@ -231,7 +231,7 @@ /** * Sets the image for this TrayIcon. The previous * tray icon image is discarded without calling the {@link - * java.awt.Image#flush} method — you will need to call it + * java.awt.Image#flush} method — you will need to call it * manually. * *

If the image represents an animated image, it will be @@ -368,7 +368,7 @@ * *

If auto-size is false, and the image size * doesn't match the tray icon space, the image is painted as-is - * inside that space — if larger than the allocated space, it will + * inside that space — if larger than the allocated space, it will * be cropped. * *

If auto-size is true, the image is stretched or shrunk to diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/Window.java --- a/jdk/src/share/classes/java/awt/Window.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/Window.java Fri Apr 04 10:24:11 2014 -0700 @@ -2550,7 +2550,7 @@ * a non-focusable Window. * * Setting the focusability state on a visible {@code Window} - * can have a delayed effect on some platforms — the actual + * can have a delayed effect on some platforms — the actual * change may happen only when the {@code Window} becomes * hidden and then visible again. To ensure consistent behavior * across platforms, set the {@code Window}'s focusable state diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/awt/im/spi/InputMethodContext.java --- a/jdk/src/share/classes/java/awt/im/spi/InputMethodContext.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/awt/im/spi/InputMethodContext.java Fri Apr 04 10:24:11 2014 -0700 @@ -85,7 +85,7 @@ *

* Input methods must call {@link java.awt.Window#dispose() Window.dispose} on the * returned input method window when it is no longer needed. - *

+ * * @param title the title to be displayed in the window's title bar, * if there is such a title bar. * A null value is treated as an empty string, "". @@ -117,7 +117,7 @@ *

* Input methods must call {@link java.awt.Window#dispose() Window.dispose} on the * returned input method window when it is no longer needed. - *

+ * * @param title the title to be displayed in the window's title bar, * if there is such a title bar. * A null value is treated as an empty string, "". diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/beans/SimpleBeanInfo.java --- a/jdk/src/share/classes/java/beans/SimpleBeanInfo.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/beans/SimpleBeanInfo.java Fri Apr 04 10:24:11 2014 -0700 @@ -108,7 +108,7 @@ * It takes the name of a resource file associated with the * current object's class file and loads an image object * from that file. Typically images will be GIFs. - *

+ * * @param resourceName A pathname relative to the directory * holding the class file of the current class. For example, * "wombat.gif". diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/beans/beancontext/BeanContextChildSupport.java --- a/jdk/src/share/classes/java/beans/beancontext/BeanContextChildSupport.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/beans/beancontext/BeanContextChildSupport.java Fri Apr 04 10:24:11 2014 -0700 @@ -262,7 +262,7 @@ * the PropertyVetoException.

* * No event is fired if old and new are equal and non-null. - *

+ * * @param name The programmatic name of the property that is about to * change * diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/beans/package.html --- a/jdk/src/share/classes/java/beans/package.html Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/beans/package.html Fri Apr 04 10:24:11 2014 -0700 @@ -150,7 +150,6 @@

  • JavaBeans, a trail in The Java Tutorial.
  • Long-Term Persistence, an article in The Swing Connection. -

    diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/net/DatagramSocket.java --- a/jdk/src/share/classes/java/net/DatagramSocket.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/net/DatagramSocket.java Fri Apr 04 10:24:11 2014 -0700 @@ -104,7 +104,7 @@ /** * Connects this socket to a remote socket address (IP address + port number). * Binds socket if not already bound. - *

    + * * @param address The remote address. * @param port The remote port * @throws SocketException if binding the socket fails. @@ -338,7 +338,7 @@ *

    * If the address is {@code null}, then the system will pick up * an ephemeral port and a valid local address to bind the socket. - *

    + * * @param addr The address and port to bind to. * @throws SocketException if any error happens during the bind, or if the * socket is already bound. @@ -1240,10 +1240,8 @@ * datagram socket factory. * @exception SocketException if the factory is already defined. * @exception SecurityException if a security manager exists and its - * {@code checkSetFactory} method doesn't allow the - operation. - * @see - java.net.DatagramSocketImplFactory#createDatagramSocketImpl() + * {@code checkSetFactory} method doesn't allow the operation. + * @see java.net.DatagramSocketImplFactory#createDatagramSocketImpl() * @see SecurityManager#checkSetFactory * @since 1.3 */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/net/InetSocketAddress.java --- a/jdk/src/share/classes/java/net/InetSocketAddress.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/net/InetSocketAddress.java Fri Apr 04 10:24:11 2014 -0700 @@ -157,7 +157,7 @@ * A valid port value is between 0 and 65535. * A port number of {@code zero} will let the system pick up an * ephemeral port in a {@code bind} operation. - *

    + * * @param port The port number * @throws IllegalArgumentException if the port parameter is outside the specified * range of valid port values. @@ -175,7 +175,7 @@ * ephemeral port in a {@code bind} operation. *

    * A {@code null} address will assign the wildcard address. - *

    + * * @param addr The IP address * @param port The port number * @throws IllegalArgumentException if the port parameter is outside the specified @@ -202,7 +202,7 @@ * A valid port value is between 0 and 65535. * A port number of {@code zero} will let the system pick up an * ephemeral port in a {@code bind} operation. - *

    + * * @param hostname the Host name * @param port The port number * @throws IllegalArgumentException if the port parameter is outside the range @@ -239,7 +239,7 @@ * A valid port value is between 0 and 65535. * A port number of {@code zero} will let the system pick up an * ephemeral port in a {@code bind} operation. - *

    + * * @param host the Host name * @param port The port number * @throws IllegalArgumentException if the port parameter is outside diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/net/ServerSocket.java --- a/jdk/src/share/classes/java/net/ServerSocket.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/net/ServerSocket.java Fri Apr 04 10:24:11 2014 -0700 @@ -157,7 +157,6 @@ * or may choose to ignore the parameter altogther. The value provided * should be greater than {@code 0}. If it is less than or equal to * {@code 0}, then an implementation specific default will be used. - *

    * * @param port the port number, or {@code 0} to use a port * number that is automatically allocated. @@ -206,7 +205,7 @@ * or may choose to ignore the parameter altogther. The value provided * should be greater than {@code 0}. If it is less than or equal to * {@code 0}, then an implementation specific default will be used. - *

    + * * @param port the port number, or {@code 0} to use a port * number that is automatically allocated. * @param backlog requested maximum length of the queue of incoming @@ -315,7 +314,7 @@ *

    * If the address is {@code null}, then the system will pick up * an ephemeral port and a valid local address to bind the socket. - *

    + * * @param endpoint The IP address and port number to bind to. * @throws IOException if the bind operation fails, or if the socket * is already bound. diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/net/Socket.java --- a/jdk/src/share/classes/java/net/Socket.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/net/Socket.java Fri Apr 04 10:24:11 2014 -0700 @@ -153,7 +153,7 @@ /** * Creates an unconnected Socket with a user-specified * SocketImpl. - *

    + * * @param impl an instance of a SocketImpl * the subclass wishes to use on the Socket. * @@ -1245,7 +1245,7 @@ *

      *
    1. For sockets accepted from a ServerSocket, this must be done by calling * {@link ServerSocket#setReceiveBufferSize(int)} before the ServerSocket - * is bound to a local address.

      2. + * is bound to a local address. *
    2. For client sockets, setReceiveBufferSize() must be called before * connecting the socket to its remote peer.
    * @param size the size to which to set the receive buffer diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/net/SocketOptions.java --- a/jdk/src/share/classes/java/net/SocketOptions.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/net/SocketOptions.java Fri Apr 04 10:24:11 2014 -0700 @@ -38,7 +38,7 @@ * DatagramSocketImpl, you won't use these directly. There are * type-safe methods to get/set each of these options in Socket, ServerSocket, * DatagramSocket and MulticastSocket. - *

    + * * @author David Brown */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/net/SocketPermission.java --- a/jdk/src/share/classes/java/net/SocketPermission.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/net/SocketPermission.java Fri Apr 04 10:24:11 2014 -0700 @@ -1001,7 +1001,7 @@ /** * Checks two SocketPermission objects for equality. - *

    + * * @param obj the object to test for equality with this object. * * @return true if obj is a SocketPermission, and has the diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/net/URL.java --- a/jdk/src/share/classes/java/net/URL.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/net/URL.java Fri Apr 04 10:24:11 2014 -0700 @@ -867,7 +867,7 @@ * Creates an integer suitable for hash table indexing.

    * * The hash code is based upon all the URL components relevant for URL - * comparison. As such, this operation is a blocking operation.

    + * comparison. As such, this operation is a blocking operation. * * @return a hash code for this {@code URL}. */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/net/URLClassLoader.java --- a/jdk/src/share/classes/java/net/URLClassLoader.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/net/URLClassLoader.java Fri Apr 04 10:24:11 2014 -0700 @@ -271,7 +271,7 @@ * by catching {@link IOException}s internally. Unchecked exceptions * and errors are not caught. Calling close on an already closed * loader has no effect. - *

    + * * @exception IOException if closing any file opened by this class loader * resulted in an IOException. Any such exceptions are caught internally. * If only one is caught, then it is re-thrown. If more than one exception diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/net/doc-files/net-properties.html --- a/jdk/src/share/classes/java/net/doc-files/net-properties.html Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/net/doc-files/net-properties.html Fri Apr 04 10:24:11 2014 -0700 @@ -35,7 +35,8 @@ java.net package. Some are checked only once at startup of the VM, and therefore are best set using the -D option of the java command, while others have a more dynamic nature and can also be changed using -the System.setProperty() API. The purpose of this document is to list +the System.setProperty() API. +The purpose of this document is to list and detail all of these properties.

    If there is no special note, a property value is checked every time it is used.

    diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/rmi/activation/ActivationGroup.java --- a/jdk/src/share/classes/java/rmi/activation/ActivationGroup.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/rmi/activation/ActivationGroup.java Fri Apr 04 10:24:11 2014 -0700 @@ -172,7 +172,7 @@ * *

    This method simply informs the group's monitor that the object * is inactive. It is up to the concrete subclass of ActivationGroup - * to fulfill the additional requirement of unexporting the object.

    + * to fulfill the additional requirement of unexporting the object. * * @param id the object's activation identifier * @return true if the object was successfully deactivated; otherwise diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/rmi/activation/ActivationGroupDesc.java --- a/jdk/src/share/classes/java/rmi/activation/ActivationGroupDesc.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/rmi/activation/ActivationGroupDesc.java Fri Apr 04 10:24:11 2014 -0700 @@ -49,7 +49,7 @@ * *

  • the group's ActivationGroupID, and *
  • the group's initialization data (in a - * java.rmi.MarshalledObject)

    + * java.rmi.MarshalledObject) * * @author Ann Wollrath * @since 1.2 diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/rmi/activation/ActivationMonitor.java --- a/jdk/src/share/classes/java/rmi/activation/ActivationMonitor.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/rmi/activation/ActivationMonitor.java Fri Apr 04 10:24:11 2014 -0700 @@ -63,7 +63,7 @@ * reference associated with id as a stale reference. * Since the reference is considered stale, a subsequent * activate call for the same activation identifier - * results in re-activating the remote object.

    + * results in re-activating the remote object. * * @param id the object's activation identifier * @exception UnknownObjectException if object is unknown diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/rmi/activation/ActivationSystem.java --- a/jdk/src/share/classes/java/rmi/activation/ActivationSystem.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/rmi/activation/ActivationSystem.java Fri Apr 04 10:24:11 2014 -0700 @@ -61,7 +61,7 @@ * receives an activate request for a specific identifier, it * looks up the activation descriptor (registered previously) for * the specified identifier and uses that information to activate - * the object.

    + * the object. * * @param desc the object's activation descriptor * @return the activation id that can be used to activate the object diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/rmi/activation/Activator.java --- a/jdk/src/share/classes/java/rmi/activation/Activator.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/rmi/activation/Activator.java Fri Apr 04 10:24:11 2014 -0700 @@ -53,7 +53,7 @@ * * The activator is responsible for monitoring and detecting when * activation groups fail so that it can remove stale remote references - * to groups and active object's within those groups.

    + * to groups and active object's within those groups. * * @author Ann Wollrath * @see ActivationInstantiator @@ -95,7 +95,7 @@ * collection for that object. If the activator kept a strong * reference to the remote object, the activator would then * prevent the object from being garbage collected under the - * normal distributed garbage collection mechanism.

    + * normal distributed garbage collection mechanism. * * @param id the activation identifier for the object being activated * @param force if true, the activator contacts the group to obtain diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/sql/Time.java --- a/jdk/src/share/classes/java/sql/Time.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/sql/Time.java Fri Apr 04 10:24:11 2014 -0700 @@ -253,7 +253,8 @@ /** * Obtains an instance of {@code Time} from a {@link LocalTime} object * with the same hour, minute and second time value as the given - * {@code LocalTime}. + * {@code LocalTime}. The nanosecond field from {@code LocalTime} is + * not part of the newly created {@code Time} object. * * @param time a {@code LocalTime} to convert * @return a {@code Time} object @@ -269,7 +270,8 @@ * Converts this {@code Time} object to a {@code LocalTime}. *

    * The conversion creates a {@code LocalTime} that represents the same - * hour, minute, and second time value as this {@code Time}. + * hour, minute, and second time value as this {@code Time}. The + * nanosecond {@code LocalTime} field will be set to zero. * * @return a {@code LocalTime} object representing the same time value * @since 1.8 diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/sql/package.html --- a/jdk/src/share/classes/java/sql/package.html Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/sql/package.html Fri Apr 04 10:24:11 2014 -0700 @@ -316,24 +316,18 @@

    Package Specification

    Related Documentation

    -@since 1.1 diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java --- a/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/java/time/format/DateTimeFormatterBuilder.java Fri Apr 04 10:24:11 2014 -0700 @@ -939,7 +939,7 @@ * During parsing, the offset is parsed using the format defined above. * If the offset cannot be parsed then an exception is thrown unless the * section of the formatter is optional. - *

    + * * @param style the format style to use, not null * @return this, for chaining, not null * @throws IllegalArgumentException if style is neither {@link TextStyle#FULL diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/naming/event/package.html --- a/jdk/src/share/classes/javax/naming/event/package.html Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/naming/event/package.html Fri Apr 04 10:24:11 2014 -0700 @@ -112,7 +112,6 @@ namingExceptionThrown() method is invoked, as shown in the sample code above, and the listener is automatically deregistered. -

    Package Specification

    diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/naming/ldap/ControlFactory.java --- a/jdk/src/share/classes/javax/naming/ldap/ControlFactory.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/naming/ldap/ControlFactory.java Fri Apr 04 10:24:11 2014 -0700 @@ -114,7 +114,7 @@ *

    * Note that a control factory * must be public and must have a public constructor that accepts no arguments. - *

    + * * @param ctl The non-null control object containing the OID and BER data. * @param ctx The possibly null context in which the control is being created. * If null, no such information is available. diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/naming/ldap/LdapContext.java --- a/jdk/src/share/classes/javax/naming/ldap/LdapContext.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/naming/ldap/LdapContext.java Fri Apr 04 10:24:11 2014 -0700 @@ -319,7 +319,7 @@ * clear the response controls. You can call it many times (and get * back the same controls) until the next context method that may return * controls is invoked. - *

    + * * @return A possibly null array of controls. If null, the previous * method invoked on this context did not produce any controls. * @exception NamingException If an error occurred while getting the response diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/naming/ldap/Rdn.java --- a/jdk/src/share/classes/javax/naming/ldap/Rdn.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/naming/ldap/Rdn.java Fri Apr 04 10:24:11 2014 -0700 @@ -352,7 +352,7 @@ * *

    * If obj is null or not an instance of Rdn, false is returned. - *

    + * * @param obj object to be compared for equality with this Rdn. * @return true if the specified object is equal to this Rdn. * @see #hashCode() diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/naming/ldap/package.html --- a/jdk/src/share/classes/javax/naming/ldap/package.html Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/naming/ldap/package.html Fri Apr 04 10:24:11 2014 -0700 @@ -255,8 +255,6 @@ } -

    -

    Package Specification

    The JNDI API Specification and related documents can be found in the diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/naming/package.html --- a/jdk/src/share/classes/javax/naming/package.html Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/naming/package.html Fri Apr 04 10:24:11 2014 -0700 @@ -81,7 +81,6 @@ The overloads that accept string names are likely to be more useful for simple applications, such as those that simply read in a name and look up the corresponding object. -

    Bindings

    diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/naming/spi/DirectoryManager.java --- a/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/naming/spi/DirectoryManager.java Fri Apr 04 10:24:11 2014 -0700 @@ -120,7 +120,6 @@ * * Service providers that implement the DirContext interface * should use this method, not NamingManager.getObjectInstance(). - *

    * * @param refInfo The possibly null object for which to create an object. * @param name The name of this object relative to nameCtx. diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/naming/spi/NamingManager.java --- a/jdk/src/share/classes/javax/naming/spi/NamingManager.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/naming/spi/NamingManager.java Fri Apr 04 10:24:11 2014 -0700 @@ -92,7 +92,7 @@ * The builder can only be installed if the executing thread is allowed * (by the security manager's checkSetFactory() method) to do so. * Once installed, the builder cannot be replaced. - *

    + * * @param builder The factory builder to install. If null, no builder * is installed. * @exception SecurityException builder cannot be installed diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/naming/spi/ObjectFactory.java --- a/jdk/src/share/classes/javax/naming/spi/ObjectFactory.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/naming/spi/ObjectFactory.java Fri Apr 04 10:24:11 2014 -0700 @@ -149,7 +149,6 @@ * If a factory uses nameCtx it should synchronize its use * against concurrent access, since context implementations are not * guaranteed to be thread-safe. - *

    * * @param obj The possibly null object containing location or reference * information that can be used in creating an object. diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/security/auth/kerberos/package-info.java --- a/jdk/src/share/classes/javax/security/auth/kerberos/package-info.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/security/auth/kerberos/package-info.java Fri Apr 04 10:24:11 2014 -0700 @@ -48,6 +48,12 @@ * {@code /lib/security} and failing that, in an OS-specific * location.

    * + * The {@code krb5.conf} file is formatted in the Windows INI file style, + * which contains a series of relations grouped into different sections. + * Each relation contains a key and a value, the value can be an arbitrary + * string or a boolean value. A boolean value can be one of "true", "false", + * "yes", or "no", case-insensitive.

    + * * @since JDK1.4 */ package javax.security.auth.kerberos; diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/sql/package.html --- a/jdk/src/share/classes/javax/sql/package.html Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/sql/package.html Fri Apr 04 10:24:11 2014 -0700 @@ -296,8 +296,7 @@

    Package Specification

    Related Documentation

    @@ -307,10 +306,8 @@ package: -

    -@since 1.4 diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/JComboBox.java --- a/jdk/src/share/classes/javax/swing/JComboBox.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/JComboBox.java Fri Apr 04 10:24:11 2014 -0700 @@ -65,7 +65,7 @@ * See How to Use Combo Boxes * in The Java Tutorial * for further information. - *

    + * * @see ComboBoxModel * @see DefaultComboBoxModel * diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/JFrame.java --- a/jdk/src/share/classes/javax/swing/JFrame.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/JFrame.java Fri Apr 04 10:24:11 2014 -0700 @@ -123,7 +123,7 @@ * has this set as the close operation and is closed in an applet, * a SecurityException may be thrown. * It is recommended you only use this in an application. - *

    + * * @since 1.3 */ public static final int EXIT_ON_CLOSE = 3; diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/JList.java --- a/jdk/src/share/classes/javax/swing/JList.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/JList.java Fri Apr 04 10:24:11 2014 -0700 @@ -260,7 +260,7 @@ * See How to Use Lists * in The Java Tutorial * for further documentation. - *

    + * * @see ListModel * @see AbstractListModel * @see DefaultListModel diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/JOptionPane.java --- a/jdk/src/share/classes/javax/swing/JOptionPane.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/JOptionPane.java Fri Apr 04 10:24:11 2014 -0700 @@ -260,7 +260,7 @@ * "Choose one", "Input", * JOptionPane.INFORMATION_MESSAGE, null, * possibleValues, possibleValues[0]); - *

    + * * * Direct Use:
    * To create and use an JOptionPane directly, the diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/JTable.java --- a/jdk/src/share/classes/javax/swing/JTable.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/JTable.java Fri Apr 04 10:24:11 2014 -0700 @@ -661,7 +661,7 @@ * with the following code: * * 

    ((Vector)rowData.elementAt(1)).elementAt(5);
    - *

    + * * @param rowData the data for the new table * @param columnNames names of each column */ @@ -678,7 +678,7 @@ * 

     rowData[1][5];
    *

    * All rows must be of the same length as columnNames. - *

    + * * @param rowData the data for the new table * @param columnNames names of each column */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/RowSorter.java --- a/jdk/src/share/classes/javax/swing/RowSorter.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/RowSorter.java Fri Apr 04 10:24:11 2014 -0700 @@ -42,10 +42,10 @@ *

    * The view invokes the following methods on the RowSorter: *

      - *
    • toggleSortOrder — The view invokes this when the + *
    • toggleSortOrder — The view invokes this when the * appropriate user gesture has occurred to trigger a sort. For example, * the user clicked a column header in a table. - *
    • One of the model change methods — The view invokes a model + *
    • One of the model change methods — The view invokes a model * change method when the underlying model * has changed. There may be order dependencies in how the events are * delivered, so a RowSorter should not update its mapping @@ -59,10 +59,10 @@ * RowSorter provides notification of changes by way of * RowSorterListener. Two types of notification are sent: *
        - *
      • RowSorterEvent.Type.SORT_ORDER_CHANGED — notifies + *
      • RowSorterEvent.Type.SORT_ORDER_CHANGED — notifies * listeners that the sort order has changed. This is typically followed * by a notification that the sort has changed. - *
      • RowSorterEvent.Type.SORTED — notifies listeners that + *
      • RowSorterEvent.Type.SORTED — notifies listeners that * the mapping maintained by the RowSorter has changed in * some way. *
      diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/SpringLayout.java --- a/jdk/src/share/classes/javax/swing/SpringLayout.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/SpringLayout.java Fri Apr 04 10:24:11 2014 -0700 @@ -991,7 +991,7 @@ * If constraints is an instance of * SpringLayout.Constraints, * associates the constraints with the specified component. - *

      + * * @param component the component being added * @param constraints the component's constraints * @@ -1029,7 +1029,7 @@ * 

            *     value(e1, c1) = value(e2, c2) + pad
      * to take place during all subsequent layout operations. - *

      + * * @param e1 the edge of the dependent * @param c1 the component of the dependent * @param pad the fixed distance between dependent and anchor @@ -1056,7 +1056,7 @@ * SpringLayout.VERTICAL_CENTER, * SpringLayout.HORIZONTAL_CENTER or * SpringLayout.BASELINE. - *

      + * * @param e1 the edge of the dependent * @param c1 the component of the dependent * @param s the spring linking dependent and anchor diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicButtonUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -325,7 +325,7 @@ /** * Method which renders the text of the current button. - *

      + * * @param g Graphics context * @param b Current button to render * @param textRect Bounding rectangle to render the text. diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicColorChooserUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -39,7 +39,7 @@ /** * Provides the basic look and feel for a JColorChooser. - *

      + * * @author Tom Santos * @author Steve Wilson */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicMenuItemUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -664,7 +664,7 @@ /** * Renders the text of the current menu item. - *

      + * * @param g graphics context * @param menuItem menu item to render * @param textRect bounding rectangle for rendering the text diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToggleButtonUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -39,7 +39,6 @@ /** * BasicToggleButton implementation - *

      * * @author Jeff Dinkins */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarSeparatorUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -39,7 +39,6 @@ /** * A Basic L&F implementation of ToolBarSeparatorUI. This implementation * is a "combined" view/controller. - *

      * * @author Jeff Shapiro */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolBarUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -44,7 +44,6 @@ /** * A Basic L&F implementation of ToolBarUI. This implementation * is a "combined" view/controller. - *

      * * @author Georges Saab * @author Jeff Shapiro diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicToolTipUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -41,7 +41,6 @@ /** * Standard tool tip L&F. - *

      * * @author Dave Moore */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java --- a/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/basic/BasicTreeUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -50,7 +50,6 @@ /** * The basic L&F for a hierarchical data structure. - *

      * * @author Scott Violet * @author Shannon Hickey (drag and drop) diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java --- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalInternalFrameUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -37,7 +37,6 @@ /** * Metal implementation of JInternalFrame. - *

      * * @author Steve Wilson */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java --- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalScrollBarUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -56,7 +56,6 @@ /** * Implementation of ScrollBarUI for the Metal Look and Feel - *

      * * @author Tom Santos * @author Steve Wilson diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java --- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalToolBarUI.java Fri Apr 04 10:24:11 2014 -0700 @@ -50,7 +50,6 @@ /** * A Metal Look and Feel implementation of ToolBarUI. This implementation * is a "combined" view/controller. - *

      * * @author Jeff Shapiro */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html --- a/jdk/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/doc-files/properties.html Fri Apr 04 10:24:11 2014 -0700 @@ -5,7 +5,7 @@

      Primary Colors

      - +
      @@ -86,7 +86,7 @@
      KeyValuePreview
      control

      Secondary Colors

      - +
      diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html --- a/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html Fri Apr 04 10:24:11 2014 -0700 @@ -49,7 +49,7 @@ href="#buttonProperties">Button properties, ArrowButton supports the following properties:

      ArrowButton Specific Properties
      -
      KeyValuePreview
      activeCaption
      +
      @@ -71,7 +71,7 @@ to the Button properties, JButton supports the following property:

      JButton Specific Properties
      -
      Property Expected Type
      +
      @@ -94,7 +94,7 @@ addition to the Button properties, JCheckBox supports the following property:

      JCheckBox Specific Properties
      -
      Property Expected Type
      +
      @@ -114,7 +114,7 @@

      JComboBox

      JComboBox is a composite component that consists of the following child Components:

      -
      Property Expected Type
      +
      @@ -159,9 +159,9 @@
      Name Type
      -

      +
      JComboBox Specific Properties
      - +
      @@ -181,7 +181,7 @@

      JFileChooser

      JFileChooser Specific Properties
      -
      Property Expected Type
      @@ -341,7 +341,7 @@

      JInternalFrame

      JInternalFrame Specific Properties
      -
      @@ -374,7 +374,7 @@ internal frame similar to that found in a frame.

      JInternalFrameTitlePane Specific Properties
      -
      @@ -473,7 +473,7 @@

      JList's sets the name of the renderer to List.renderer. JList supports the following properties:

      JList Specific Properties
      -
      +
      @@ -516,7 +516,7 @@ MENU_ITEM_ACCELERATOR is used for painting the accelerator. Both Regions paint text using the TEXT_FOREGROUND ColorType. The following set of properties are supported:

      -
      Property Expected Type
      +
      @@ -570,7 +570,7 @@

      Prefix is one of: CheckBoxMenuItem, Menu, MenuItem, or RadioButtonMenuItem.

      JMenu also supports the following properties:

      -
      Property Expected Type
      +
      @@ -599,7 +599,7 @@ OptionPane.comboBox, OptionPane.scrollPane, OptionPane.list, OptionPane.textField, OptionPane.iconLabel.

      JOptionPane Specific Properties
      -
      Property Expected Type
      +
      @@ -713,7 +713,7 @@
      JProgressBar Specific Properties
      -
      Property Expected Type
      @@ -754,7 +754,7 @@ addition to the Button properties, JRadioButton supports the following property:

      JRadioButton Specific Properties
      -
      +
      @@ -774,7 +774,7 @@

      JScrollBar

      JScrollBar is a composite component that consists of the following child Components:

      -
      Property Expected Type
      +
      @@ -788,9 +788,9 @@
      Name Type
      -

      +
      JScrollBar Specific Properties
      - +
      @@ -844,7 +844,7 @@

      Separators

      All of the separator classes, JSeparator, JPopupMenu.Separator and JToolBar.Separator use the same property:

      -
      Property Expected Type
      +
      @@ -863,7 +863,7 @@
      Property Expected Type

      JToolBar.Separator also supports the following property:

      - +
      @@ -896,7 +896,7 @@ Viewports border.

      JScrollPane Specific Properties
      -
      Property Expected Type
      +
      @@ -920,7 +920,7 @@ SplitPaneDivider.leftOneTouchButton and SplitPaneDivider.rightOneTouchButton.

      JSplitPane Specific Properties
      -
      Property Expected Type
      +
      @@ -964,7 +964,7 @@

      JSlider

      JSlider Specific Properties
      -
      Property Expected Type
      @@ -1024,7 +1024,7 @@

      JTabbedPane

      JTabbedPane Specific Properties
      -
      @@ -1088,7 +1088,7 @@

      JTable sets the name of the renderer to Table.cellRenderer. JTable supports the following properties:

      JTable Specific Properties
      -
      +
      @@ -1133,7 +1133,7 @@

      JTree sets the name of the renderer to Tree.renderer, the name of the editor is Tree.cellEditor.

      JTree Specific Properties
      -
      Property Expected Type
      +
      @@ -1217,7 +1217,7 @@ addition to the Button properties, JToggleButton supports the following property:

      JToggleButton Specific Properties
      -
      Property Expected Type
      +
      @@ -1238,7 +1238,7 @@

      Each of the Button classes (JButton, JCheckBox, JRadioButton, JToggleButton and SynthArrowButton) support a similar set of properties. These properties are:

      -
      Property Expected Type
      +
      @@ -1283,7 +1283,7 @@

      Text Properties

      -
      Property Expected Type
      diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html --- a/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/plaf/synth/doc-files/synthFileFormat.html Fri Apr 04 10:24:11 2014 -0700 @@ -739,12 +739,12 @@ </state> </style> - +

      The following outlines which painter will be used for what - SynthPainter method: + SynthPainter method:

      -
      +
      StateMethodPainter
      SELECTEDpaintButtonBackgroundstateButtonBackgroundPainter
      SELECTEDAnything but paintButtonBackgroundstateFallbackPainter diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/text/GlyphView.java --- a/jdk/src/share/classes/javax/swing/text/GlyphView.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/text/GlyphView.java Fri Apr 04 10:24:11 2014 -0700 @@ -56,7 +56,6 @@ * expanded if this view is embedded in a container that does * tab expansion. ParagraphView is an example of a container * that does tab expansion. - *

      * * @since 1.3 * diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/text/StyleConstants.java --- a/jdk/src/share/classes/javax/swing/text/StyleConstants.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/text/StyleConstants.java Fri Apr 04 10:24:11 2014 -0700 @@ -42,7 +42,6 @@ *

      Diagram shows SpaceAbove, FirstLineIndent, LeftIndent, RightIndent, * and SpaceBelow a paragraph.

      - *

      * * @author Timothy Prinzing */ diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/text/View.java --- a/jdk/src/share/classes/javax/swing/text/View.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/text/View.java Fri Apr 04 10:24:11 2014 -0700 @@ -183,7 +183,6 @@

    • {@link #removeUpdate removeUpdate}
    • {@link #changedUpdate changedUpdate} -

      * * @author Timothy Prinzing diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/text/html/StyleSheet.java --- a/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/text/html/StyleSheet.java Fri Apr 04 10:24:11 2014 -0700 @@ -116,7 +116,7 @@ * concepts we do not currently * support are pseudo selectors, such as A:link { color: red }, * and the important modifier. - *

      + * * @implNote This implementation is currently * incomplete. It can be replaced with alternative implementations * that are complete. Future versions of this class will provide diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/javax/swing/undo/UndoableEdit.java --- a/jdk/src/share/classes/javax/swing/undo/UndoableEdit.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/javax/swing/undo/UndoableEdit.java Fri Apr 04 10:24:11 2014 -0700 @@ -47,7 +47,7 @@ * be incorporated into a larger edit and treated as a single edit. *

    • If addEdit returns false replaceEdit * is called on the new edit with the current edit passed in as the - * argument. This is the inverse of addEdit — + * argument. This is the inverse of addEdit — * if the new edit returns true from replaceEdit, the new * edit replaces the current edit. * diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java --- a/jdk/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/management/snmp/util/SnmpListTableCache.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -43,6 +43,7 @@ *

      NOTE: This class is not synchronized, subclasses must implement * the appropriate synchronization whwn needed.

      **/ +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpListTableCache extends SnmpTableCache { diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java --- a/jdk/src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/management/snmp/util/SnmpNamedListTableCache.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,6 +49,7 @@ *

      NOTE: This class is not synchronized, subclasses must implement * the appropriate synchronization whwn needed.

      **/ +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpNamedListTableCache extends SnmpListTableCache { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/management/snmp/util/SnmpTableCache.java --- a/jdk/src/share/classes/sun/management/snmp/util/SnmpTableCache.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/management/snmp/util/SnmpTableCache.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -45,6 +45,7 @@ *

      NOTE: This class is not synchronized, subclasses must implement * the appropriate synchronization when needed.

      **/ +@SuppressWarnings("serial") // JDK implementation class public abstract class SnmpTableCache implements Serializable { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/security/krb5/Config.java --- a/jdk/src/share/classes/sun/security/krb5/Config.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/Config.java Fri Apr 04 10:24:11 2014 -0700 @@ -32,20 +32,15 @@ import java.io.File; import java.io.FileInputStream; -import java.util.Hashtable; -import java.util.Vector; -import java.util.ArrayList; +import java.util.*; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.IOException; -import java.util.StringTokenizer; import java.net.InetAddress; import java.net.UnknownHostException; import java.security.AccessController; import java.security.PrivilegedExceptionAction; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; + import sun.net.dns.ResolverConfiguration; import sun.security.krb5.internal.crypto.EType; import sun.security.krb5.internal.Krb5; @@ -232,6 +227,31 @@ } /** + * Gets the boolean value for the specified keys. Returns TRUE if the + * string value is "yes", or "true", FALSE if "no", or "false", or null + * if otherwise or not defined. The comparision is case-insensitive. + * + * @param keys the keys, see {@link #get(String...)} + * @return the boolean value, or null if there is no value defined or the + * value does not look like a boolean value. + * @throws IllegalArgumentException see {@link #get(String...)} + */ + public Boolean getBooleanObject(String... keys) { + String s = get(keys); + if (s == null) { + return null; + } + switch (s.toLowerCase(Locale.US)) { + case "yes": case "true": + return Boolean.TRUE; + case "no": case "false": + return Boolean.FALSE; + default: + return null; + } + } + + /** * Gets all values for the specified keys. * @throws IllegalArgumentException if any of the keys is illegal * (See {@link #get}) @@ -317,23 +337,6 @@ } /** - * Gets the boolean value for the specified keys. - * @param keys the keys - * @return the boolean value, false is returned if it cannot be - * found or the value is not "true" (case insensitive). - * @throw IllegalArgumentException if any of the keys is illegal - * @see #get(java.lang.String[]) - */ - public boolean getBooleanValue(String... keys) { - String val = get(keys); - if (val != null && val.equalsIgnoreCase("true")) { - return true; - } else { - return false; - } - } - - /** * Parses a string to an integer. The convertible strings include the * string representations of positive integers, negative integers, and * hex decimal integers. Valid inputs are, e.g., -1234, +1234, @@ -341,7 +344,7 @@ * * @param input the String to be converted to an Integer. * @return an numeric value represented by the string - * @exception NumberFormationException if the String does not contain a + * @exception NumberFormatException if the String does not contain a * parsable integer. */ private int parseIntValue(String input) throws NumberFormatException { @@ -927,32 +930,20 @@ * use addresses if "no_addresses" or "noaddresses" is set to false */ public boolean useAddresses() { - boolean useAddr = false; - // use addresses if "no_addresses" is set to false - String value = get("libdefaults", "no_addresses"); - useAddr = (value != null && value.equalsIgnoreCase("false")); - if (useAddr == false) { - // use addresses if "noaddresses" is set to false - value = get("libdefaults", "noaddresses"); - useAddr = (value != null && value.equalsIgnoreCase("false")); - } - return useAddr; + return getBooleanObject("libdefaults", "no_addresses") == Boolean.FALSE || + getBooleanObject("libdefaults", "noaddresses") == Boolean.FALSE; } /** - * Check if need to use DNS to locate Kerberos services + * Check if need to use DNS to locate Kerberos services for name. If not + * defined, check dns_fallback, whose default value is true. */ private boolean useDNS(String name) { - String value = get("libdefaults", name); - if (value == null) { - value = get("libdefaults", "dns_fallback"); - if ("false".equalsIgnoreCase(value)) { - return false; - } else { - return true; - } + Boolean value = getBooleanObject("libdefaults", name); + if (value != null) { + return value.booleanValue(); } else { - return value.equalsIgnoreCase("true"); + return getBooleanObject("libdefaults", "dns_fallback") != Boolean.FALSE; } } diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/security/krb5/internal/KDCOptions.java --- a/jdk/src/share/classes/sun/security/krb5/internal/KDCOptions.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/internal/KDCOptions.java Fri Apr 04 10:24:11 2014 -0700 @@ -299,14 +299,14 @@ if ((options & KDC_OPT_RENEWABLE_OK) == KDC_OPT_RENEWABLE_OK) { set(RENEWABLE_OK, true); } else { - if (config.getBooleanValue("libdefaults", "renewable")) { + if (config.getBooleanObject("libdefaults", "renewable") == Boolean.TRUE) { set(RENEWABLE_OK, true); } } if ((options & KDC_OPT_PROXIABLE) == KDC_OPT_PROXIABLE) { set(PROXIABLE, true); } else { - if (config.getBooleanValue("libdefaults", "proxiable")) { + if (config.getBooleanObject("libdefaults", "proxiable") == Boolean.TRUE) { set(PROXIABLE, true); } } @@ -314,7 +314,7 @@ if ((options & KDC_OPT_FORWARDABLE) == KDC_OPT_FORWARDABLE) { set(FORWARDABLE, true); } else { - if (config.getBooleanValue("libdefaults", "forwardable")) { + if (config.getBooleanObject("libdefaults", "forwardable") == Boolean.TRUE) { set(FORWARDABLE, true); } } diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java --- a/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/security/krb5/internal/crypto/EType.java Fri Apr 04 10:24:11 2014 -0700 @@ -58,8 +58,8 @@ boolean allowed = false; try { Config cfg = Config.getInstance(); - String temp = cfg.get("libdefaults", "allow_weak_crypto"); - if (temp != null && temp.equals("true")) allowed = true; + allowed = cfg.getBooleanObject("libdefaults", "allow_weak_crypto") + == Boolean.TRUE; } catch (Exception exc) { if (DEBUG) { System.out.println ("Exception in getting allow_weak_crypto, " + diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/java/AmbiguousClass.java --- a/jdk/src/share/classes/sun/tools/java/AmbiguousClass.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/java/AmbiguousClass.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -34,6 +34,7 @@ * they are subject to change or removal without notice. */ +@SuppressWarnings("serial") // JDK implementation class public class AmbiguousClass extends ClassNotFound { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/java/AmbiguousMember.java --- a/jdk/src/share/classes/sun/tools/java/AmbiguousMember.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/java/AmbiguousMember.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -35,6 +35,7 @@ * supported API. Code that depends on them does so at its own risk: * they are subject to change or removal without notice. */ +@SuppressWarnings("serial") // JDK implementation class public class AmbiguousMember extends Exception { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/java/ClassNotFound.java --- a/jdk/src/share/classes/sun/tools/java/ClassNotFound.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/java/ClassNotFound.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,7 @@ * supported API. Code that depends on them does so at its own risk: * they are subject to change or removal without notice. */ +@SuppressWarnings("serial") // JDK implementation class public class ClassNotFound extends Exception { /** diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/java/CompilerError.java --- a/jdk/src/share/classes/sun/tools/java/CompilerError.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/java/CompilerError.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ * supported API. Code that depends on them does so at its own risk: * they are subject to change or removal without notice. */ - +@SuppressWarnings("serial") // JDK implementation class public class CompilerError extends Error { Throwable e; diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/java/SyntaxError.java --- a/jdk/src/share/classes/sun/tools/java/SyntaxError.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/java/SyntaxError.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,7 +33,7 @@ * supported API. Code that depends on them does so at its own risk: * they are subject to change or removal without notice. */ - +@SuppressWarnings("serial") // JDK implementation class public class SyntaxError extends Exception { } diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/jconsole/Tab.java --- a/jdk/src/share/classes/sun/tools/jconsole/Tab.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/jconsole/Tab.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,6 +28,7 @@ import java.awt.*; import javax.swing.*; +@SuppressWarnings("serial") // JDK implementation class public abstract class Tab extends JPanel { private String name; private Worker worker; diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/jconsole/inspector/XOperations.java --- a/jdk/src/share/classes/sun/tools/jconsole/inspector/XOperations.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/jconsole/inspector/XOperations.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -39,6 +39,7 @@ import sun.tools.jconsole.JConsole; import sun.tools.jconsole.Messages; +@SuppressWarnings("serial") // JDK implementation class public abstract class XOperations extends JPanel implements ActionListener { public final static String OPERATION_INVOCATION_EVENT = diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/jconsole/inspector/XTable.java --- a/jdk/src/share/classes/sun/tools/jconsole/inspector/XTable.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/jconsole/inspector/XTable.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; +@SuppressWarnings("serial") // JDK implementation class public abstract class XTable extends JTable { static final int NAME_COLUMN = 0; static final int VALUE_COLUMN = 1; diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/jstat/Jstat.java --- a/jdk/src/share/classes/sun/tools/jstat/Jstat.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/jstat/Jstat.java Fri Apr 04 10:24:11 2014 -0700 @@ -70,16 +70,7 @@ logSamples(); } } catch (MonitorException e) { - if (e.getMessage() != null) { - System.err.println(e.getMessage()); - } else { - Throwable cause = e.getCause(); - if ((cause != null) && (cause.getMessage() != null)) { - System.err.println(cause.getMessage()); - } else { - e.printStackTrace(); - } - } + e.printStackTrace(); System.exit(1); } System.exit(0); diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/jstat/ParserException.java --- a/jdk/src/share/classes/sun/tools/jstat/ParserException.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/jstat/ParserException.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -31,6 +31,7 @@ * @author Brian Doherty * @since 1.5 */ +@SuppressWarnings("serial") // JDK implementation class public class ParserException extends Exception { public ParserException() { diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/tools/jstat/SyntaxException.java --- a/jdk/src/share/classes/sun/tools/jstat/SyntaxException.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/tools/jstat/SyntaxException.java Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,6 +36,7 @@ * @author Brian Doherty * @since 1.5 */ +@SuppressWarnings("serial") // JDK implementation class public class SyntaxException extends ParserException { private String message; diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/TimeZoneNames.java --- a/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/TimeZoneNames.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"Syowa Time", "SYOT", "Syowa Summer Time", "SYOST", "Syowa Time", "SYOT"}}, + {"Antarctica/Troll", new String[] {"Coordinated Universal Time", "UTC", + "Central European Summer Time", "CEST", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"Vostok Time", "VOST", "Vostok Summer Time", "VOSST", "Vostok Time", "VOST"}}, @@ -839,7 +842,7 @@ "Samara Time", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java --- a/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/de/TimeZoneNames_de.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"Syowa Zeit", "SYOT", "Syowa Sommerzeit", "SYOST", "Syowa Zeit", "SYOT"}}, + {"Antarctica/Troll", new String[] {"Koordinierte Universalzeit", "UTC", + "Mitteleurop\u00e4ische Sommerzeit", "MESZ", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"Vostok Zeit", "VOST", "Vostok Sommerzeit", "VOSST", "Vostok Zeit", "VOST"}}, @@ -838,7 +841,7 @@ "Samarische Zeit", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java --- a/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/es/TimeZoneNames_es.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"Hora de Syowa", "SYOT", "Hora de verano de Syowa", "SYOST", "Hora de Syowa", "SYOT"}}, + {"Antarctica/Troll", new String[] {"Hora Universal Coordinada", "UTC", + "Hora de verano de Europa Central", "CEST", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"Hora de Vostok", "VOST", "Hora de verano de Vostok", "VOSST", "Hora de Vostok", "VOST"}}, @@ -838,7 +841,7 @@ "Hora de Samara", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java --- a/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"Heure de Syowa", "SYOT", "Heure d'\u00e9t\u00e9 de Syowa", "SYOST", "Heure de Syowa", "SYOT"}}, + {"Antarctica/Troll", new String[] {"Temps universel coordonn\u00e9", "UTC", + "Heure d'\u00e9t\u00e9 d'Europe centrale", "CEST", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"Heure de Vostok", "VOST", "Heure d'\u00e9t\u00e9 de Vostok", "VOSST", "Heure de Vostok", "VOST"}}, @@ -838,7 +841,7 @@ "Heure de Samara", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java --- a/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/it/TimeZoneNames_it.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"Ora di Syowa", "SYOT", "Ora estiva di Syowa", "SYOST", "Ora di Syowa", "SYOT"}}, + {"Antarctica/Troll", new String[] {"Tempo universale coordinato", "UTC", + "Ora estiva dell'Europa centrale", "CEST", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"Ora di Vostok", "VOST", "Ora estiva di Vostok", "VOSST", "Ora di Vostok", "VOST"}}, @@ -838,7 +841,7 @@ "Ora di Samara", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java --- a/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"\u662d\u548c\u57fa\u5730\u6642\u9593", "SYOT", "\u662d\u548c\u57fa\u5730\u590f\u6642\u9593", "SYOST", "\u662D\u548C\u57FA\u5730\u6642\u9593", "SYOT"}}, + {"Antarctica/Troll", new String[] {"\u5354\u5b9a\u4e16\u754c\u6642", "UTC", + "\u4e2d\u90e8\u30e8\u30fc\u30ed\u30c3\u30d1\u590f\u6642\u9593", "CEST", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u6642\u9593", "VOST", "\u30dc\u30b9\u30c8\u30fc\u30af\u57fa\u5730\u590f\u6642\u9593", "VOSST", "\u30DC\u30B9\u30C8\u30FC\u30AF\u6642\u9593", "VOST"}}, @@ -838,7 +841,7 @@ "\u30B5\u30DE\u30E9\u6642\u9593", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java --- a/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"Syowa \uc2dc\uac04", "SYOT", "Syowa \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "SYOST", "\uC1FC\uC640 \uD45C\uC900\uC2DC", "SYOT"}}, + {"Antarctica/Troll", new String[] {"\uc138\uacc4 \ud45c\uc900\uc2dc", "UTC", + "\uc911\uc559 \uc720\ub7fd \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CEST", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"Vostok \uc2dc\uac04", "VOST", "Vostok \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VOSST", "\uBCF4\uC2A4\uD1A1 \uD45C\uC900\uC2DC", "VOST"}}, @@ -838,7 +841,7 @@ "\uC0AC\uB9C8\uB77C \uD45C\uC900\uC2DC", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java --- a/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/pt/TimeZoneNames_pt_BR.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"Fuso hor\u00e1rio de Syowa", "SYOT", "Fuso hor\u00e1rio de ver\u00e3o de Syowa", "SYOST", "Hor\u00E1rio de Syowa", "SYOT"}}, + {"Antarctica/Troll", new String[] {"Tempo universal coordenado", "UTC", + "Fuso hor\u00e1rio de ver\u00e3o da Europa Central", "CEST", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"Fuso hor\u00e1rio de Vostok", "VOST", "Fuso hor\u00e1rio de ver\u00e3o de Vostok", "VOSST", "Hor\u00E1rio de Vostok", "VOST"}}, @@ -838,7 +841,7 @@ "Hor\u00E1rio de Samara", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java --- a/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"Syowa, normaltid", "SYOT", "Syowa, sommartid", "SYOST", "Syowa-tid", "SYOT"}}, + {"Antarctica/Troll", new String[] {"Koordinerad universell tid", "UTC", + "Centraleuropeisk sommartid", "CEST", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"Vostok, normaltid", "VOST", "Vostok, sommartid", "VOSST", "Vostok-tid", "VOST"}}, @@ -838,7 +841,7 @@ "Samara-tid", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java --- a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_CN.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"Syowa \u65f6\u95f4", "SYOT", "Syowa \u590f\u4ee4\u65f6", "SYOST", "Syowa \u65F6\u95F4", "SYOT"}}, + {"Antarctica/Troll", new String[] {"\u534f\u8c03\u4e16\u754c\u65f6\u95f4", "UTC", + "\u4e2d\u6b27\u590f\u4ee4\u65f6", "CEST", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"\u83ab\u65af\u6258\u514b\u65f6\u95f4", "VOST", "\u83ab\u65af\u6258\u514b\u590f\u4ee4\u65f6", "VOSST", "\u83AB\u65AF\u6258\u514B\u65F6\u95F4", "VOST"}}, @@ -838,7 +841,7 @@ "\u6C99\u9A6C\u62C9\u65F6\u95F4", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java --- a/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/classes/sun/util/resources/zh/TimeZoneNames_zh_TW.java Fri Apr 04 10:24:11 2014 -0700 @@ -570,6 +570,9 @@ {"Antarctica/Syowa", new String[] {"\u5915\u6b50\u74e6 (Syowa) \u6642\u9593", "SYOT", "\u5915\u6b50\u74e6 (Syowa) \u590f\u4ee4\u6642\u9593", "SYOST", "\u5915\u6B50\u74E6 (Syowa) \u6642\u9593", "SYOT"}}, + {"Antarctica/Troll", new String[] {"\u5354\u8abf\u4e16\u754c\u6642\u9593", "UTC", + "\u4e2d\u6b50\u590f\u4ee4\u6642\u9593", "CEST", + "Troll Time", "ATT"}}, {"Antarctica/Vostok", new String[] {"\u4f5b\u65af\u6258 (Vostok) \u6642\u9593", "VOST", "\u4f5b\u65af\u6258 (Vostok) \u590f\u4ee4\u6642\u9593", "VOSST", "\u4F5B\u65AF\u6258 (Vostok) \u6642\u9593", "VOST"}}, @@ -840,7 +843,7 @@ "\u6C99\u99AC\u62C9\u6642\u9593", "SAMT"}}, {"Europe/San_Marino", CET}, {"Europe/Sarajevo", CET}, - {"Europe/Simferopol", EET}, + {"Europe/Simferopol", MSK}, {"Europe/Skopje", CET}, {"Europe/Sofia", EET}, {"Europe/Stockholm", CET}, diff -r b813b1ee855d -r 29dc629ec823 jdk/src/share/native/sun/security/smartcardio/pcsc.c --- a/jdk/src/share/native/sun/security/smartcardio/pcsc.c Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/src/share/native/sun/security/smartcardio/pcsc.c Fri Apr 04 10:24:11 2014 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -64,17 +64,32 @@ #define J2PCSC_EXCEPTION_NAME "sun/security/smartcardio/PCSCException" +void throwOutOfMemoryError(JNIEnv *env, const char *msg) { + jclass cls = (*env)->FindClass(env, "java/lang/OutOfMemoryError"); + + if (cls != NULL) /* Otherwise an exception has already been thrown */ + (*env)->ThrowNew(env, cls, msg); + +} + void throwPCSCException(JNIEnv* env, LONG code) { jclass pcscClass; jmethodID constructor; jthrowable pcscException; pcscClass = (*env)->FindClass(env, J2PCSC_EXCEPTION_NAME); - assert(pcscClass != NULL); + if (pcscClass == NULL) { + return; + } constructor = (*env)->GetMethodID(env, pcscClass, "", "(I)V"); - assert(constructor != NULL); - pcscException = (jthrowable) (*env)->NewObject(env, pcscClass, constructor, (jint)code); - (*env)->Throw(env, pcscException); + if (constructor == NULL) { + return; + } + pcscException = (jthrowable) (*env)->NewObject(env, pcscClass, + constructor, (jint)code); + if (pcscException != NULL) { + (*env)->Throw(env, pcscException); + } } jboolean handleRV(JNIEnv* env, LONG code) { @@ -121,6 +136,10 @@ } tab = (char **)malloc(cnt * sizeof(char *)); + if (tab == NULL) { + throwOutOfMemoryError(env, NULL); + return NULL; + } cnt = 0; cp = spec; @@ -130,12 +149,26 @@ } stringClass = (*env)->FindClass(env, "java/lang/String"); - assert(stringClass != NULL); + if (stringClass == NULL) { + free(tab); + return NULL; + } result = (*env)->NewObjectArray(env, cnt, stringClass, NULL); - while (cnt-- > 0) { - js = (*env)->NewStringUTF(env, tab[cnt]); - (*env)->SetObjectArrayElement(env, result, cnt, js); + if (result != NULL) { + while (cnt-- > 0) { + js = (*env)->NewStringUTF(env, tab[cnt]); + if ((*env)->ExceptionCheck(env)) { + free(tab); + return NULL; + } + (*env)->SetObjectArrayElement(env, result, cnt, js); + if ((*env)->ExceptionCheck(env)) { + free(tab); + return NULL; + } + (*env)->DeleteLocalRef(env, js); + } } free(tab); return result; @@ -158,6 +191,11 @@ dprintf1("-size: %d\n", size); mszReaders = malloc(size); + if (mszReaders == NULL) { + throwOutOfMemoryError(env, NULL); + return NULL; + } + rv = CALL_SCardListReaders(context, NULL, mszReaders, &size); if (handleRV(env, rv)) { free(mszReaders); @@ -181,6 +219,9 @@ DWORD proto; readerName = (*env)->GetStringUTFChars(env, jReaderName, NULL); + if (readerName == NULL) { + return 0; + } rv = CALL_SCardConnect(context, readerName, jShareMode, jPreferredProtocols, &card, &proto); (*env)->ReleaseStringUTFChars(env, jReaderName, readerName); dprintf1("-cardhandle: %x\n", card); @@ -210,6 +251,9 @@ sendPci.cbPciLength = sizeof(SCARD_IO_REQUEST); sbuf = (unsigned char *) ((*env)->GetByteArrayElements(env, jBuf, NULL)); + if (sbuf == NULL) { + return NULL; + } rv = CALL_SCardTransmit(card, &sendPci, sbuf + ofs, len, NULL, rbuf, &rlen); (*env)->ReleaseByteArrayElements(env, jBuf, (jbyte *)sbuf, JNI_ABORT); @@ -218,7 +262,12 @@ } jOut = (*env)->NewByteArray(env, rlen); - (*env)->SetByteArrayRegion(env, jOut, 0, rlen, (jbyte *)rbuf); + if (jOut != NULL) { + (*env)->SetByteArrayRegion(env, jOut, 0, rlen, (jbyte *)rbuf); + if ((*env)->ExceptionCheck(env)) { + return NULL; + } + } return jOut; } @@ -234,7 +283,7 @@ DWORD state; DWORD protocol; jbyteArray jArray; - jbyte tmp; + jbyte status[2]; rv = CALL_SCardStatus(card, readerName, &readerLen, &state, &protocol, atr, &atrLen); if (handleRV(env, rv)) { @@ -245,13 +294,19 @@ dprintf1("-protocol: %d\n", protocol); jArray = (*env)->NewByteArray(env, atrLen); + if (jArray == NULL) { + return NULL; + } (*env)->SetByteArrayRegion(env, jArray, 0, atrLen, (jbyte *)atr); - - tmp = (jbyte)state; - (*env)->SetByteArrayRegion(env, jStatus, 0, 1, &tmp); - tmp = (jbyte)protocol; - (*env)->SetByteArrayRegion(env, jStatus, 1, 1, &tmp); - + if ((*env)->ExceptionCheck(env)) { + return NULL; + } + status[0] = (jbyte) state; + status[1] = (jbyte) protocol; + (*env)->SetByteArrayRegion(env, jStatus, 0, 2, status); + if ((*env)->ExceptionCheck(env)) { + return NULL; + } return jArray; } @@ -274,36 +329,72 @@ SCARDCONTEXT context = (SCARDCONTEXT)jContext; LONG rv; int readers = (*env)->GetArrayLength(env, jReaderNames); - SCARD_READERSTATE *readerState = malloc(readers * sizeof(SCARD_READERSTATE)); + SCARD_READERSTATE *readerState; int i; - jintArray jEventState; - int *currentState = (*env)->GetIntArrayElements(env, jCurrentState, NULL); + jintArray jEventState = NULL; + int *currentState = NULL; + const char *readerName; + + readerState = calloc(readers, sizeof(SCARD_READERSTATE)); + if (readerState == NULL) { + throwOutOfMemoryError(env, NULL); + return NULL; + } + + currentState = (*env)->GetIntArrayElements(env, jCurrentState, NULL); + if (currentState == NULL) { + free(readerState); + return NULL; + } for (i = 0; i < readers; i++) { jobject jReaderName = (*env)->GetObjectArrayElement(env, jReaderNames, i); - readerState[i].szReader = (*env)->GetStringUTFChars(env, jReaderName, NULL); + if ((*env)->ExceptionCheck(env)) { + goto cleanup; + } + readerName = (*env)->GetStringUTFChars(env, jReaderName, NULL); + if (readerName == NULL) { + goto cleanup; + } + readerState[i].szReader = strdup(readerName); + (*env)->ReleaseStringUTFChars(env, jReaderName, readerName); + if (readerState[i].szReader == NULL) { + throwOutOfMemoryError(env, NULL); + goto cleanup; + } readerState[i].pvUserData = NULL; readerState[i].dwCurrentState = currentState[i]; readerState[i].dwEventState = SCARD_STATE_UNAWARE; readerState[i].cbAtr = 0; + (*env)->DeleteLocalRef(env, jReaderName); } - (*env)->ReleaseIntArrayElements(env, jCurrentState, currentState, JNI_ABORT); rv = CALL_SCardGetStatusChange(context, (DWORD)jTimeout, readerState, readers); + if (handleRV(env, rv)) { + goto cleanup; + } jEventState = (*env)->NewIntArray(env, readers); + if (jEventState == NULL) { + goto cleanup; + } for (i = 0; i < readers; i++) { jint eventStateTmp; - jobject jReaderName = (*env)->GetObjectArrayElement(env, jReaderNames, i); dprintf3("-reader status %s: 0x%X, 0x%X\n", readerState[i].szReader, readerState[i].dwCurrentState, readerState[i].dwEventState); - (*env)->ReleaseStringUTFChars(env, jReaderName, readerState[i].szReader); eventStateTmp = (jint)readerState[i].dwEventState; (*env)->SetIntArrayRegion(env, jEventState, i, 1, &eventStateTmp); + if ((*env)->ExceptionCheck(env)) { + jEventState = NULL; + goto cleanup; + } + } +cleanup: + (*env)->ReleaseIntArrayElements(env, jCurrentState, currentState, JNI_ABORT); + for (i = 0; i < readers; i++) { + free((char *)readerState[i].szReader); } free(readerState); - - handleRV(env, rv); return jEventState; } @@ -336,13 +427,18 @@ { SCARDHANDLE card = (SCARDHANDLE)jCard; LONG rv; - jbyte* sendBuffer = (*env)->GetByteArrayElements(env, jSendBuffer, NULL); + jbyte* sendBuffer; jint sendBufferLength = (*env)->GetArrayLength(env, jSendBuffer); jbyte receiveBuffer[MAX_STACK_BUFFER_SIZE]; jint receiveBufferLength = MAX_STACK_BUFFER_SIZE; ULONG returnedLength = 0; jbyteArray jReceiveBuffer; + sendBuffer = (*env)->GetByteArrayElements(env, jSendBuffer, NULL); + if (sendBuffer == NULL) { + return NULL; + } + #ifdef J2PCSC_DEBUG { int k; @@ -375,7 +471,12 @@ #endif jReceiveBuffer = (*env)->NewByteArray(env, returnedLength); + if (jReceiveBuffer == NULL) { + return NULL; + } (*env)->SetByteArrayRegion(env, jReceiveBuffer, 0, returnedLength, receiveBuffer); - + if ((*env)->ExceptionCheck(env)) { + return NULL; + } return jReceiveBuffer; } diff -r b813b1ee855d -r 29dc629ec823 jdk/test/java/lang/ref/EarlyTimeout.java --- a/jdk/test/java/lang/ref/EarlyTimeout.java Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/test/java/lang/ref/EarlyTimeout.java Fri Apr 04 10:24:11 2014 -0700 @@ -37,7 +37,7 @@ /** * In order to demonstrate the issue we make several threads (two appears to be sufficient) * to block in ReferenceQueue#remove(timeout) at the same time. - * Then, we force a reference to be enqueued by setting its referent to null and calling System.gs(). + * Then, we force a reference to be enqueued by setting its referent to null and calling System.gc(). * One of the threads gets the reference returned from the remove(). * The other threads get null: * 1) with bug: this may happen before the specified timeout is elapsed, @@ -63,7 +63,10 @@ threads[i] = new EarlyTimeout(); threads[i].start(); } + // The main thread waits until the threads has started and give it a chance + // for the threads to block on the queue.remove(TIMEOUT) call startedSignal.await(); + Thread.sleep(TIMEOUT / 2); referent = null; System.gc(); for (EarlyTimeout thread : threads) { @@ -82,7 +85,7 @@ nonNullRefCount++; } } - if (nonNullRefCount != 1) { + if (nonNullRefCount > 1) { throw new RuntimeException("more than one references were removed from queue"); } } diff -r b813b1ee855d -r 29dc629ec823 jdk/test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/xml/bind/xjc/8032884/XjcOptionalPropertyTest.java Fri Apr 04 10:24:11 2014 -0700 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8032884 + * @summary Globalbindings optionalProperty="primitive" does not work when minOccurs=0 + * @run shell compile-schema.sh + * @run main/othervm XjcOptionalPropertyTest + */ + +import java.io.IOException; +import java.lang.reflect.Method; + +public class XjcOptionalPropertyTest { + + public static void main(String[] args) throws IOException { + + generated.Foo foo = new generated.Foo(); + log("foo = " + foo); + Method[] methods = foo.getClass().getMethods(); + log("Found [" + methods.length + "] methods"); + for (int i = 0; i < methods.length; i++) { + Method method = methods[i]; + if (method.getName().equals("setFoo")) { + log("Checking method [" + method.getName() + "]"); + Class[] parameterTypes = method.getParameterTypes(); + if (parameterTypes.length != 1) + fail("more than 1 parameter"); + if (!parameterTypes[0].isPrimitive()) { + fail("Found [" + parameterTypes[0].getName() + "], but expected primitive!"); + } + break; + } + } + log("TEST PASSED."); + + } + + private static void fail(String message) { + throw new RuntimeException(message); + } + + private static void log(String msg) { + System.out.println(msg); + } + +} diff -r b813b1ee855d -r 29dc629ec823 jdk/test/javax/xml/bind/xjc/8032884/compile-schema.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/xml/bind/xjc/8032884/compile-schema.sh Fri Apr 04 10:24:11 2014 -0700 @@ -0,0 +1,39 @@ +#! /bin/sh + +# +# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# + +if [ "x$TESTJAVA" = x ]; then + TESTJAVA=$1; shift + TESTCLASSES=. +fi + +echo "cleaning generated files ..." +rm -rfv ${TESTSRC}/generated + +echo "compiling [optional-property-schema.xsd] schema ..." +$TESTJAVA/bin/xjc -p generated -d ${TESTSRC} ${TESTSRC}/optional-property-schema.xsd + +echo "Schema compiled. Verification of generated files can be done now." diff -r b813b1ee855d -r 29dc629ec823 jdk/test/javax/xml/bind/xjc/8032884/optional-property-schema.xsd --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/xml/bind/xjc/8032884/optional-property-schema.xsd Fri Apr 04 10:24:11 2014 -0700 @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff -r b813b1ee855d -r 29dc629ec823 jdk/test/sun/security/krb5/config/YesNo.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/config/YesNo.java Fri Apr 04 10:24:11 2014 -0700 @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 8029995 + * @summary accept yes/no for boolean krb5.conf settings + * @compile -XDignore.symbol.file YesNo.java + * @run main/othervm YesNo + */ +import sun.security.krb5.Config; +import sun.security.krb5.internal.crypto.EType; + +import java.util.Arrays; + +public class YesNo { + static Config config = null; + public static void main(String[] args) throws Exception { + System.setProperty("java.security.krb5.conf", + System.getProperty("test.src", ".") +"/yesno.conf"); + config = Config.getInstance(); + check("a", Boolean.TRUE); + check("b", Boolean.FALSE); + check("c", Boolean.TRUE); + check("d", Boolean.FALSE); + check("e", null); + check("f", null); + + if (!Arrays.stream(EType.getBuiltInDefaults()) + .anyMatch(n -> n < 4)) { + throw new Exception(); + } + } + + static void check(String k, Boolean expected) throws Exception { + Boolean result = config.getBooleanObject("libdefaults", k); + if (expected != result) { + throw new Exception("value for " + k + " is " + result); + } + } +} diff -r b813b1ee855d -r 29dc629ec823 jdk/test/sun/security/krb5/config/yesno.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/sun/security/krb5/config/yesno.conf Fri Apr 04 10:24:11 2014 -0700 @@ -0,0 +1,7 @@ +[libdefaults] +a = true +b = FALSE +c = YES +d = no +e = nothing +allow_weak_crypto = yes diff -r b813b1ee855d -r 29dc629ec823 jdk/test/sun/util/calendar/zi/tzdata/VERSION --- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION Fri Apr 04 10:24:11 2014 -0700 @@ -21,4 +21,4 @@ # or visit www.oracle.com if you need additional information or have any # questions. # -tzdata2014a +tzdata2014b diff -r b813b1ee855d -r 29dc629ec823 jdk/test/sun/util/calendar/zi/tzdata/africa --- a/jdk/test/sun/util/calendar/zi/tzdata/africa Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/test/sun/util/calendar/zi/tzdata/africa Fri Apr 04 10:24:11 2014 -0700 @@ -891,7 +891,10 @@ # Another source (specifying the time for start and end in the decree): # http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html -# From Paul Eggert (2013-10-03): +# From Sebastien Willemijns (2014-03-18): +# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp + +# From Paul Eggert (2014-03-19): # To estimate what the Moroccan government will do in future years, # transition dates for 2014 through 2038 were determined by running # the following program under GNU Emacs 24.3: diff -r b813b1ee855d -r 29dc629ec823 jdk/test/sun/util/calendar/zi/tzdata/antarctica --- a/jdk/test/sun/util/calendar/zi/tzdata/antarctica Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/test/sun/util/calendar/zi/tzdata/antarctica Fri Apr 04 10:24:11 2014 -0700 @@ -253,24 +253,41 @@ # year-round base # Scott Base, Ross Island, since 1957-01. # See Pacific/Auckland. -# -# These rules for New Zealand are stolen from the 'australasia' file. -# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule NZAQ 1974 only - Nov 3 2:00s 1:00 D -Rule NZAQ 1975 1988 - Oct lastSun 2:00s 1:00 D -Rule NZAQ 1989 only - Oct 8 2:00s 1:00 D -Rule NZAQ 1990 2006 - Oct Sun>=1 2:00s 1:00 D -Rule NZAQ 1975 only - Feb 23 2:00s 0 S -Rule NZAQ 1976 1989 - Mar Sun>=1 2:00s 0 S -Rule NZAQ 1990 2007 - Mar Sun>=15 2:00s 0 S -Rule NZAQ 2007 max - Sep lastSun 2:00s 1:00 D -Rule NZAQ 2008 max - Apr Sun>=1 2:00s 0 S # Norway - territories # Bouvet (never inhabited) # # claims # Peter I Island (never inhabited) +# +# year-round base +# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12 +# +# From Paul-Inge Flakstad (2014-03-10): +# I recently had a long dialog about this with the developer of timegenie.com. +# In the absence of specific dates, he decided to choose some likely ones: +# GMT +1 - From March 1 to the last Sunday in March +# GMT +2 - From the last Sunday in March until the last Sunday in October +# GMT +1 - From the last Sunday in October until November 7 +# GMT +0 - From November 7 until March 1 +# The dates for switching to and from UTC+0 will probably not be absolutely +# correct, but they should be quite close to the actual dates. +# +# From Paul Eggert (2014-03-21): +# The CET-switching Troll rules require zic from tzcode 2014b or later, so as +# suggested by Bengt-Inge Larsson comment them out for now, and approximate +# with only UTC and CEST. Uncomment them when 2014b is more prevalent. +# +# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S +#Rule Troll 2005 max - Mar 1 1:00u 1:00 CET +Rule Troll 2005 max - Mar lastSun 1:00u 2:00 CEST +#Rule Troll 2005 max - Oct lastSun 1:00u 1:00 CET +#Rule Troll 2004 max - Nov 7 1:00u 0:00 UTC +# Remove the following line when uncommenting the above '#Rule' lines. +Rule Troll 2004 max - Oct lastSun 1:00u 0:00 UTC +# Zone NAME GMTOFF RULES FORMAT [UNTIL] +Zone Antarctica/Troll 0 - zzz 2005 Feb 12 + 0:00 Troll %s # Poland - year-round base # Arctowski, King George Island, -620945-0582745, since 1977 diff -r b813b1ee855d -r 29dc629ec823 jdk/test/sun/util/calendar/zi/tzdata/australasia --- a/jdk/test/sun/util/calendar/zi/tzdata/australasia Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/test/sun/util/calendar/zi/tzdata/australasia Fri Apr 04 10:24:11 2014 -0700 @@ -786,14 +786,29 @@ # Johnston # -# From Paul Eggert (2013-09-03): +# From Paul Eggert (2014-03-11): +# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind. +# Details are uncertain. We have no data for Johnston after 1970, so +# treat it like Hawaii for now. +# # In his memoirs of June 6th to October 4, 1945 # (2005), Herbert C. Bach writes, # "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM # Johnston time, 1:30 AM Kwajalein time." This was in June 1945, and # confirms that Johnston kept the same time as Honolulu in summer 1945. -# We have no better information, so for now, assume this has been true -# indefinitely into the past. +# +# From Lyle McElhaney (2014-03-11): +# [W]hen JI was being used for that [atomic bomb] testing, the time being used +# was not Hawaiian time but rather the same time being used on the ships, +# which had a GMT offset of -11 hours. This apparently applied to at least the +# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last +# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin, +# "The United States High-Altitude Test Experience: A Review Emphasizing the +# Impact on the Environment", Los Alamos LA-6405, Oct 1976 +# . +# See the table on page 4 where he lists GMT and local times for the tests; a +# footnote for the JI tests reads that local time is "JI time = Hawaii Time +# Minus One Hour". # # See 'northamerica' for Pacific/Johnston. diff -r b813b1ee855d -r 29dc629ec823 jdk/test/sun/util/calendar/zi/tzdata/europe --- a/jdk/test/sun/util/calendar/zi/tzdata/europe Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/test/sun/util/calendar/zi/tzdata/europe Fri Apr 04 10:24:11 2014 -0700 @@ -2986,7 +2986,11 @@ # Assume it happened in March by not changing the clocks. 3:00 Russia MSK/MSD 1997 3:00 - MSK 1997 Mar lastSun 1:00u - 2:00 EU EE%sT +# From Alexander Krivenyshev (2014-03-17): +# time change at 2:00 (2am) on March 30, 2014 +# http://vz.ru/news/2014/3/17/677464.html + 2:00 EU EE%sT 2014 Mar 30 2:00 + 4:00 - MSK # Vatican City # See Europe/Rome. diff -r b813b1ee855d -r 29dc629ec823 jdk/test/sun/util/calendar/zi/tzdata/leapseconds --- a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/test/sun/util/calendar/zi/tzdata/leapseconds Fri Apr 04 10:24:11 2014 -0700 @@ -20,7 +20,7 @@ # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any # questions. - +# # Allowance for leapseconds added to each timezone file. # This file is in the public domain. diff -r b813b1ee855d -r 29dc629ec823 jdk/test/sun/util/calendar/zi/tzdata/zone.tab --- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab Fri Apr 04 10:03:18 2014 -0700 +++ b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab Fri Apr 04 10:24:11 2014 -0700 @@ -74,6 +74,7 @@ AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I +AQ -720041+0023206 Antarctica/Troll Troll Station, Queen Maud Land AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF) AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN) @@ -366,6 +367,7 @@ RU +5545+03735 Europe/Moscow Moscow+00 - west Russia RU +4844+04425 Europe/Volgograd Moscow+00 - Caspian Sea RU +5312+05009 Europe/Samara Moscow+00 - Samara, Udmurtia +RU +4457+03406 Europe/Simferopol Moscow+00 - Crimea RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk @@ -421,7 +423,6 @@ UA +5026+03031 Europe/Kiev most locations UA +4837+02218 Europe/Uzhgorod Ruthenia UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk / Zaporizhia, E Luhansk -UA +4457+03406 Europe/Simferopol central Crimea UG +0019+03225 Africa/Kampala UM +1645-16931 Pacific/Johnston Johnston Atoll UM +2813-17722 Pacific/Midway Midway Islands diff -r b813b1ee855d -r 29dc629ec823 langtools/.hgtags --- a/langtools/.hgtags Fri Apr 04 10:03:18 2014 -0700 +++ b/langtools/.hgtags Fri Apr 04 10:24:11 2014 -0700 @@ -248,3 +248,4 @@ 151222468d1d04ce6613d33efa3d45bfaf53e3e5 jdk9-b03 fa2ec6b6b1697ae4a78b03b609664dc6b47dee86 jdk9-b04 1d5e6fc88a4cca287090c16b0530a0d5849a5603 jdk9-b05 +31946c0a3f4dc2c78f6f09a0524aaa2a0dad1c78 jdk9-b06 diff -r b813b1ee855d -r 29dc629ec823 nashorn/.hgtags --- a/nashorn/.hgtags Fri Apr 04 10:03:18 2014 -0700 +++ b/nashorn/.hgtags Fri Apr 04 10:24:11 2014 -0700 @@ -239,3 +239,4 @@ 832f89ff25d903c45cfc994553f1ade8821a4398 jdk9-b03 3f6ef92cd7823372c45e79125adba4cbf1c9f7b2 jdk9-b04 2a1cac93c33317d828d4a5b81239204a9927cc4a jdk9-b05 +1f75bcbe74e315470dc0b75b7d5bcd209e287c39 jdk9-b06