--- a/jdk/make/data/fontconfig/aix.fontconfig.properties Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/make/data/fontconfig/aix.fontconfig.properties Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
#
#
-# Copyright 2013 SAP AG. All rights reserved.
+# Copyright (c) 2013 SAP SE. 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
--- a/jdk/make/data/tzdata/VERSION Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/make/data/tzdata/VERSION Thu Feb 11 16:06:51 2016 -0800
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2015g
+tzdata2016a
--- a/jdk/make/data/tzdata/asia Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/make/data/tzdata/asia Thu Feb 11 16:06:51 2016 -0800
@@ -897,6 +897,15 @@
9:00 - TLT
# India
+
+# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
+# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
+# (2015-12-22):
+# In January 1906, several thousand cotton-mill workers rioted on the
+# outskirts of Bombay.... They were protesting the proposed abolition of
+# local time in favor of Indian Standard Time.... Journalists called this
+# dispute the "Battle of the Clocks." It lasted nearly half a century.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
5:53:20 - HMT 1941 Oct # Howrah Mean Time?
@@ -1107,8 +1116,15 @@
Rule Iran 2032 2033 - Sep 21 0:00 0 S
Rule Iran 2034 2035 - Mar 22 0:00 1:00 D
Rule Iran 2034 2035 - Sep 22 0:00 0 S
-Rule Iran 2036 2037 - Mar 21 0:00 1:00 D
-Rule Iran 2036 2037 - Sep 21 0:00 0 S
+#
+# The following rules are approximations starting in the year 2038.
+# These are the best post-2037 approximations available, given the
+# restrictions of a single rule using a Gregorian-based data format.
+# At some point this table will need to be extended, though quite
+# possibly Iran will change the rules first.
+Rule Iran 2036 max - Mar 21 0:00 1:00 D
+Rule Iran 2036 max - Sep 21 0:00 0 S
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Tehran 3:25:44 - LMT 1916
3:25:44 - TMT 1946 # Tehran Mean Time
@@ -2134,8 +2150,8 @@
# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S
-Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 -
+Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S
+Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 -
Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
Rule Pakistan 2008 2009 - Nov 1 0:00 0 -
Rule Pakistan 2009 only - Apr 15 0:00 1:00 S
--- a/jdk/make/data/tzdata/backward Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/make/data/tzdata/backward Thu Feb 11 16:06:51 2016 -0800
@@ -46,6 +46,7 @@
Link America/Toronto America/Montreal
Link America/Rio_Branco America/Porto_Acre
Link America/Argentina/Cordoba America/Rosario
+Link America/Tijuana America/Santa_Isabel
Link America/Denver America/Shiprock
Link America/Port_of_Spain America/Virgin
Link Pacific/Auckland Antarctica/South_Pole
--- a/jdk/make/data/tzdata/europe Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/make/data/tzdata/europe Thu Feb 11 16:06:51 2016 -0800
@@ -2616,13 +2616,20 @@
# Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
# Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
+# From Alexander Krivenyshev (2016-01-02):
+# [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
+# Asia/Chita [is changing] from UTC+8 to UTC+9. Effective date will
+# be March 27, 2016 at 2:00am....
+# http://publication.pravo.gov.ru/Document/View/000120151230010
+
Zone Asia/Chita 7:33:52 - LMT 1919 Dec 15
8:00 - YAKT 1930 Jun 21 # Yakutsk Time
9:00 Russia YAK%sT 1991 Mar 31 2:00s
8:00 Russia YAK%sT 1992 Jan 19 2:00s
9:00 Russia YAK%sT 2011 Mar 27 2:00s
10:00 - YAKT 2014 Oct 26 2:00s
- 8:00 - IRKT
+ 8:00 - IRKT 2016 Mar 27 2:00
+ 9:00 - YAKT
# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
@@ -3177,6 +3184,12 @@
# It's officially announced now by the Ministry of Energy.
# Turkey delays winter time to 8th of November 04:00
# http://www.aa.com.tr/tr/turkiye/yaz-saati-uygulamasi-8-kasimda-sona-erecek/362217
+#
+# From BBC News (2015-10-25):
+# Confused Turks are asking "what's the time?" after automatic clocks defied a
+# government decision ... "For the next two weeks #Turkey is on EEST... Erdogan
+# Engineered Standard Time," said Twitter user @aysekarahasan.
+# http://www.bbc.com/news/world-europe-34631326
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Turkey 1916 only - May 1 0:00 1:00 S
--- a/jdk/make/data/tzdata/northamerica Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/make/data/tzdata/northamerica Thu Feb 11 16:06:51 2016 -0800
@@ -348,6 +348,16 @@
# Statue 175 closer in synch with the US Congress' intent....
# http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
+# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
+# Fort Pierre is technically located in the Mountain time zone as is
+# the rest of Stanley County. Most of Stanley County and Fort Pierre
+# uses the Central time zone due to doing most of their business in
+# Pierre so it simplifies schedules. I have lived in Stanley County
+# all my life and it has been that way since I can remember. (43 years!)
+#
+# From Paul Eggert (2015-12-25):
+# Assume this practice predates 1970, so Fort Pierre can use America/Chicago.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Chicago 1920 only - Jun 13 2:00 1:00 D
Rule Chicago 1920 1921 - Oct lastSun 2:00 0 S
@@ -504,6 +514,12 @@
# For lack of better information, assume that Metlakatla's
# abandonment of use of daylight saving resulted from the 1983 vote.
+# From Steffen Thorsen (2015-11-09):
+# It seems Metlakatla did go off PST on Sunday, November 1, changing
+# their time to AKST and are going to follow Alaska's DST, switching
+# between AKST and AKDT from now on....
+# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Juneau 15:02:19 - LMT 1867 Oct 18
-8:57:41 - LMT 1900 Aug 20 12:00
@@ -529,7 +545,8 @@
-8:00 US P%sT 1946
-8:00 - PST 1969
-8:00 US P%sT 1983 Oct 30 2:00
- -8:00 - PST
+ -8:00 - PST 2015 Nov 1 2:00
+ -9:00 US AK%sT
Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18
-9:18:55 - LMT 1900 Aug 20 12:00
-9:00 - YST 1942
@@ -2610,25 +2627,6 @@
-8:00 US P%sT 2002 Feb 20
-8:00 Mexico P%sT 2010
-8:00 US P%sT
-# Baja California (away from US border)
-Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32
- -7:00 - MST 1924
- -8:00 - PST 1927 Jun 10 23:00
- -7:00 - MST 1930 Nov 15
- -8:00 - PST 1931 Apr 1
- -8:00 1:00 PDT 1931 Sep 30
- -8:00 - PST 1942 Apr 24
- -8:00 1:00 PWT 1945 Aug 14 23:00u
- -8:00 1:00 PPT 1945 Nov 12 # Peace
- -8:00 - PST 1948 Apr 5
- -8:00 1:00 PDT 1949 Jan 14
- -8:00 - PST 1954
- -8:00 CA P%sT 1961
- -8:00 - PST 1976
- -8:00 US P%sT 1996
- -8:00 Mexico P%sT 2001
- -8:00 US P%sT 2002 Feb 20
- -8:00 Mexico P%sT
# From Paul Eggert (2006-03-22):
# Formerly there was an America/Ensenada zone, which differed from
# America/Tijuana only in that it did not observe DST from 1976
@@ -2641,6 +2639,13 @@
# other than America/Tijuana for Baja, but it's not clear yet what its
# name or contents should be.
#
+# From Paul Eggert (2015-10-08):
+# Formerly there was an America/Santa_Isabel zone, but this appears to
+# have come from a misreading of
+# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
+# It has been moved to the 'backward' file.
+#
+#
# Revillagigedo Is
# no information
@@ -2715,17 +2720,7 @@
-4:00 US A%sT
# Cayman Is
-
-# From Paul Eggert (2015-05-15):
-# The Cayman government has decided to introduce DST in 2016, the idea being
-# to keep in sync with New York. The legislation hasn't passed but the change
-# seems quite likely. See: Meade B. Cayman 27.
-# http://www.cayman27.com.ky/2015/05/15/clock-ticks-toward-daylight-saving-time-in-cayman
-
-Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
- -5:07:11 - KMT 1912 Feb # Kingston Mean Time
- -5:00 - EST 2016
- -5:00 US E%sT
+# See America/Panama.
# Costa Rica
@@ -3248,6 +3243,7 @@
Zone America/Panama -5:18:08 - LMT 1890
-5:19:36 - CMT 1908 Apr 22 # Colón Mean Time
-5:00 - EST
+Link America/Panama America/Cayman
# Puerto Rico
# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
--- a/jdk/make/data/tzdata/zone.tab Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/make/data/tzdata/zone.tab Thu Feb 11 16:06:51 2016 -0800
@@ -306,8 +306,7 @@
MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border
MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border
MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora
-MX +3232-11701 America/Tijuana US Pacific Time - Baja California near US border
-MX +3018-11452 America/Santa_Isabel Mexican Pacific Time - Baja California away from US border
+MX +3232-11701 America/Tijuana US Pacific Time - Baja California state
MX +2048-10515 America/Bahia_Banderas Mexican Central Time - Bahia de Banderas
MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia
MY +0133+11020 Asia/Kuching Sabah & Sarawak
@@ -437,10 +436,10 @@
US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
US +340308-1181434 America/Los_Angeles Pacific Time
-US +550737-1313435 America/Metlakatla Pacific Standard Time - Annette Island, Alaska
US +611305-1495401 America/Anchorage Alaska Time
US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle
+US +550737-1313435 America/Metlakatla Alaska Time - Annette Island
US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck
US +643004-1652423 America/Nome Alaska Time - west Alaska
US +515248-1763929 America/Adak Aleutian Islands
--- a/jdk/make/src/classes/build/tools/tzdb/ZoneRules.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/make/src/classes/build/tools/tzdb/ZoneRules.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -232,7 +232,7 @@
static void writeRule(ZoneOffsetTransitionRule rule, DataOutput out) throws IOException {
int month = rule.getMonth().getValue();
byte dom = (byte)rule.getDayOfMonthIndicator();
- int dow = rule.getDayOfWeek().getValue();
+ int dow = (rule.getDayOfWeek() == null ? -1 : rule.getDayOfWeek().getValue());
LocalTime time = rule.getLocalTime();
boolean timeEndOfDay = rule.isMidnightEndOfDay();
TimeDefinition timeDefinition = rule.getTimeDefinition();
--- a/jdk/src/java.base/aix/classes/sun/nio/ch/AixAsynchronousChannelProvider.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/aix/classes/sun/nio/ch/AixAsynchronousChannelProvider.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012 SAP AG. All rights reserved.
+ * Copyright (c) 2012 SAP SE. 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
--- a/jdk/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/aix/classes/sun/nio/ch/AixPollPort.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012 SAP AG. All rights reserved.
+ * Copyright (c) 2012 SAP SE. 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
--- a/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileStore.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileStore.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2013 SAP SE. 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
--- a/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystem.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystem.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2013 SAP SE. 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
--- a/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystemProvider.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/aix/classes/sun/nio/fs/AixFileSystemProvider.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2013 SAP SE. 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
--- a/jdk/src/java.base/aix/classes/sun/nio/fs/AixNativeDispatcher.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/aix/classes/sun/nio/fs/AixNativeDispatcher.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2013 SAP SE. 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
--- a/jdk/src/java.base/aix/native/libnio/ch/AixPollPort.c Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/aix/native/libnio/ch/AixPollPort.c Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2012 SAP AG. All rights reserved.
+ * Copyright (c) 2012 SAP SE. 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
--- a/jdk/src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2013 SAP SE. 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
--- a/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/Invokers.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
@@ -305,9 +305,7 @@
/** Static definition of MethodHandle.invokeExact checking code. */
/*non-public*/ static
@ForceInline
- void checkExactType(Object mhObj, Object expectedObj) {
- MethodHandle mh = (MethodHandle) mhObj;
- MethodType expected = (MethodType) expectedObj;
+ void checkExactType(MethodHandle mh, MethodType expected) {
MethodType actual = mh.type();
if (actual != expected)
throw newWrongMethodTypeException(expected, actual);
@@ -319,9 +317,7 @@
*/
/*non-public*/ static
@ForceInline
- Object checkGenericType(Object mhObj, Object expectedObj) {
- MethodHandle mh = (MethodHandle) mhObj;
- MethodType expected = (MethodType) expectedObj;
+ MethodHandle checkGenericType(MethodHandle mh, MethodType expected) {
return mh.asType(expected);
/* Maybe add more paths here. Possible optimizations:
* for (R)MH.invoke(a*),
@@ -390,14 +386,13 @@
/** Static definition of MethodHandle.invokeGeneric checking code. */
/*non-public*/ static
@ForceInline
- Object getCallSiteTarget(Object site) {
- return ((CallSite)site).getTarget();
+ MethodHandle getCallSiteTarget(CallSite site) {
+ return site.getTarget();
}
/*non-public*/ static
@ForceInline
- void checkCustomized(Object o) {
- MethodHandle mh = (MethodHandle)o;
+ void checkCustomized(MethodHandle mh) {
if (MethodHandleImpl.isCompileConstant(mh)) return;
if (mh.form.customized == null) {
maybeCustomize(mh);
@@ -425,13 +420,13 @@
try {
NamedFunction nfs[] = {
NF_checkExactType = new NamedFunction(Invokers.class
- .getDeclaredMethod("checkExactType", Object.class, Object.class)),
+ .getDeclaredMethod("checkExactType", MethodHandle.class, MethodType.class)),
NF_checkGenericType = new NamedFunction(Invokers.class
- .getDeclaredMethod("checkGenericType", Object.class, Object.class)),
+ .getDeclaredMethod("checkGenericType", MethodHandle.class, MethodType.class)),
NF_getCallSiteTarget = new NamedFunction(Invokers.class
- .getDeclaredMethod("getCallSiteTarget", Object.class)),
+ .getDeclaredMethod("getCallSiteTarget", CallSite.class)),
NF_checkCustomized = new NamedFunction(Invokers.class
- .getDeclaredMethod("checkCustomized", Object.class))
+ .getDeclaredMethod("checkCustomized", MethodHandle.class))
};
// Each nf must be statically invocable or we get tied up in our bootstraps.
assert(InvokerBytecodeGenerator.isStaticallyInvocable(nfs));
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Thu Feb 11 16:06:51 2016 -0800
@@ -856,7 +856,8 @@
* @return the desired method handle
* @throws NoSuchMethodException if the method does not exist
* @throws IllegalAccessException if access checking fails,
- * or if the method is {@code static}
+ * or if the method is {@code static},
+ * or if the method is {@code private} method of interface,
* or if the method's variable arity modifier bit
* is set and {@code asVarargsCollector} fails
* @exception SecurityException if a security manager is present and it
--- a/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java Thu Feb 11 16:06:51 2016 -0800
@@ -182,22 +182,30 @@
private static final ConcurrentMap<Key, MethodHandle> CACHE;
+ /**
+ * Dump generated classes to disk, for debugging purposes.
+ */
+ private static final ProxyClassesDumper DUMPER;
+
static {
// Poke the privileged block once, taking everything we need:
- final Object[] values = new Object[3];
+ final Object[] values = new Object[4];
AccessController.doPrivileged((PrivilegedAction<Object>) () -> {
values[0] = System.getProperty("java.lang.invoke.stringConcat");
values[1] = Boolean.getBoolean("java.lang.invoke.stringConcat.cache");
values[2] = Boolean.getBoolean("java.lang.invoke.stringConcat.debug");
+ values[3] = System.getProperty("java.lang.invoke.stringConcat.dumpClasses");
return null;
});
final String strategy = (String) values[0];
CACHE_ENABLE = (Boolean) values[1];
DEBUG = (Boolean) values[2];
+ final String dumpPath = (String) values[3];
STRATEGY = (strategy == null) ? DEFAULT_STRATEGY : Strategy.valueOf(strategy);
CACHE = CACHE_ENABLE ? new ConcurrentHashMap<>() : null;
+ DUMPER = (dumpPath == null) ? null : ProxyClassesDumper.getInstance(dumpPath);
}
private static final class Key {
@@ -552,6 +560,12 @@
Objects.requireNonNull(o, "Cannot accept null constants");
}
+ if ((lookup.lookupModes() & MethodHandles.Lookup.PRIVATE) == 0) {
+ throw new StringConcatException(String.format(
+ "Invalid caller: %s",
+ lookup.lookupClass().getName()));
+ }
+
int cCount = 0;
int oCount = 0;
if (generateRecipe) {
@@ -1035,6 +1049,10 @@
final byte[] classBytes = cw.toByteArray();
final Class<?> innerClass = UNSAFE.defineAnonymousClass(targetClass, classBytes, null);
+ if (DUMPER != null) {
+ DUMPER.dumpClass(innerClass.getName(), classBytes);
+ }
+
try {
UNSAFE.ensureClassInitialized(innerClass);
return lookup.findStatic(innerClass, NAME_FACTORY, args);
--- a/jdk/src/java.base/share/classes/java/time/ZoneOffset.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/share/classes/java/time/ZoneOffset.java Thu Feb 11 16:06:51 2016 -0800
@@ -150,7 +150,7 @@
*/
public static final ZoneOffset UTC = ZoneOffset.ofTotalSeconds(0);
/**
- * Constant for the maximum supported offset.
+ * Constant for the minimum supported offset.
*/
public static final ZoneOffset MIN = ZoneOffset.ofTotalSeconds(-MAX_SECONDS);
/**
--- a/jdk/src/java.base/share/classes/java/time/ZonedDateTime.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/share/classes/java/time/ZonedDateTime.java Thu Feb 11 16:06:51 2016 -0800
@@ -1707,13 +1707,18 @@
* Note that this is a different approach to that used by days, months and years,
* thus adding one day is not the same as adding 24 hours.
* <p>
- * For example, consider a time-zone where the spring DST cutover means that the
- * local times 01:00 to 01:59 occur twice changing from offset +02:00 to +01:00.
+ * For example, consider a time-zone, such as 'Europe/Paris', where the
+ * Autumn DST cutover means that the local times 02:00 to 02:59 occur twice
+ * changing from offset +02:00 in summer to +01:00 in winter.
* <ul>
- * <li>Adding one hour to 00:30+02:00 will result in 01:30+02:00
- * <li>Adding one hour to 01:30+02:00 will result in 01:30+01:00
- * <li>Adding one hour to 01:30+01:00 will result in 02:30+01:00
- * <li>Adding three hours to 00:30+02:00 will result in 02:30+01:00
+ * <li>Adding one hour to 01:30+02:00 will result in 02:30+02:00
+ * (both in summer time)
+ * <li>Adding one hour to 02:30+02:00 will result in 02:30+01:00
+ * (moving from summer to winter time)
+ * <li>Adding one hour to 02:30+01:00 will result in 03:30+01:00
+ * (both in winter time)
+ * <li>Adding three hours to 01:30+02:00 will result in 03:30+01:00
+ * (moving from summer to winter time)
* </ul>
* <p>
* This instance is immutable and unaffected by this method call.
@@ -1948,13 +1953,18 @@
* Note that this is a different approach to that used by days, months and years,
* thus subtracting one day is not the same as adding 24 hours.
* <p>
- * For example, consider a time-zone where the spring DST cutover means that the
- * local times 01:00 to 01:59 occur twice changing from offset +02:00 to +01:00.
+ * For example, consider a time-zone, such as 'Europe/Paris', where the
+ * Autumn DST cutover means that the local times 02:00 to 02:59 occur twice
+ * changing from offset +02:00 in summer to +01:00 in winter.
* <ul>
- * <li>Subtracting one hour from 02:30+01:00 will result in 01:30+02:00
- * <li>Subtracting one hour from 01:30+01:00 will result in 01:30+02:00
- * <li>Subtracting one hour from 01:30+02:00 will result in 00:30+01:00
- * <li>Subtracting three hours from 02:30+01:00 will result in 00:30+02:00
+ * <li>Subtracting one hour from 03:30+01:00 will result in 02:30+01:00
+ * (both in winter time)
+ * <li>Subtracting one hour from 02:30+01:00 will result in 02:30+02:00
+ * (moving from winter to summer time)
+ * <li>Subtracting one hour from 02:30+02:00 will result in 01:30+02:00
+ * (both in summer time)
+ * <li>Subtracting three hours from 03:30+01:00 will result in 01:30+02:00
+ * (moving from winter to summer time)
* </ul>
* <p>
* This instance is immutable and unaffected by this method call.
--- a/jdk/src/java.base/share/classes/java/time/temporal/ChronoUnit.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/share/classes/java/time/temporal/ChronoUnit.java Thu Feb 11 16:06:51 2016 -0800
@@ -184,8 +184,8 @@
* Artificial unit that represents the concept of forever.
* This is primarily used with {@link TemporalField} to represent unbounded fields
* such as the year or era.
- * The estimated duration of the era is artificially defined as the largest duration
- * supported by {@code Duration}.
+ * The estimated duration of this unit is artificially defined as the largest duration
+ * supported by {@link Duration}.
*/
FOREVER("Forever", Duration.ofSeconds(Long.MAX_VALUE, 999_999_999));
--- a/jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.base/share/classes/sun/util/resources/TimeZoneNames.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -275,6 +275,9 @@
String XJT[] = new String[] {"Xinjiang Standard Time", "XJT",
"Xinjiang Daylight Time", "XJDT",
"Xinjiang Time", "XJT"};
+ String YAKT[] = new String[] {"Yakutsk Time", "YAKT",
+ "Yakutsk Summer Time", "YAKST",
+ "Yakutsk Time", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -486,7 +489,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Pierre & Miquelon Standard Time", "PMST",
"Pierre & Miquelon Daylight Time", "PMDT",
@@ -607,7 +610,7 @@
"Brunei Summer Time", "BNST",
"Brunei Time", "BNT"}},
{"Asia/Calcutta", IST},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Choibalsan Time", "CHOT",
"Choibalsan Summer Time", "CHOST",
"Choibalsan Time", "CHOT"}},
@@ -648,10 +651,7 @@
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga Time", "YAKT",
- "Khandyga Summer Time", "YAKST",
- "Khandyga Time", "YAKT"}},
-
+ {"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
@@ -717,9 +717,7 @@
{"Asia/Vladivostok", new String[] {"Vladivostok Time", "VLAT",
"Vladivostok Summer Time", "VLAST",
"Vladivostok Time", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"Yakutsk Time", "YAKT",
- "Yakutsk Summer Time", "YAKST",
- "Yakutsk Time", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Yekaterinburg Time", "YEKT",
"Yekaterinburg Summer Time", "YEKST",
"Yekaterinburg Time", "YEKT"}},
--- a/jdk/src/java.desktop/aix/native/libawt/porting_aix.c Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.desktop/aix/native/libawt/porting_aix.c Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/jdk/src/java.desktop/aix/native/libawt/porting_aix.h Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.desktop/aix/native/libawt/porting_aix.h Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright 2012, 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2012, 2013 SAP SE. 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
--- a/jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCAckHandler.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/java.rmi/share/classes/sun/rmi/transport/DGCAckHandler.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2016, 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
@@ -118,6 +118,9 @@
if (objList != null && task == null) {
task = scheduler.schedule(new Runnable() {
public void run() {
+ if (id != null) {
+ idTable.remove(id);
+ }
release();
}
}, dgcAckTimeout, TimeUnit.MILLISECONDS);
--- a/jdk/src/jdk.attach/aix/classes/sun/tools/attach/AttachProviderImpl.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.attach/aix/classes/sun/tools/attach/AttachProviderImpl.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2013 SAP AG. All rights reserved.
+ * Copyright (c) 2013 SAP SE. 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
--- a/jdk/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.attach/aix/classes/sun/tools/attach/VirtualMachineImpl.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/jdk/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.attach/aix/native/libattach/VirtualMachineImpl.c Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/TimeZoneNames_de.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/de/TimeZoneNames_de.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -276,6 +276,9 @@
String XJT[] = new String[] {"Chinesische Normalzeit", "XJT",
"Chinesische Sommerzeit", "XJDT",
"Zeitzone f\u00FCr China", "XJT"};
+ String YAKT[] = new String[] {"Jakutsk Zeit", "YAKT",
+ "Jakutsk Sommerzeit", "YAKST",
+ "Jakutsk Zeit", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -487,7 +490,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Pierre & Miquelon Normalzeit", "PMST",
"Pierre & Miquelon Sommerzeit", "PMDT",
@@ -608,7 +611,7 @@
"Brunei Sommerzeit", "BNST",
"Brunei Zeit", "BNT"}},
{"Asia/Calcutta", IST},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Choibalsan Zeit", "CHOT",
"Choibalsan Sommerzeit", "CHOST",
"Choibalsan Zeit", "CHOT"}},
@@ -649,9 +652,7 @@
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Chandyga Zeit", "YAKT",
- "Chandyga Sommerzeit", "YAKST",
- "Chandyga Zeit", "YAKT"}},
+ {"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
@@ -717,9 +718,7 @@
{"Asia/Vladivostok", new String[] {"Wladiwostok Zeit", "VLAT",
"Wladiwostok Sommerzeit", "VLAST",
"Wladiwostok Zeit", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"Jakutsk Zeit", "YAKT",
- "Jakutsk Sommerzeit", "YAKST",
- "Jakutsk Zeit", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Jekaterinburger Zeit", "YEKT",
"Jekaterinburger Sommerzeit", "YEKST",
"Jekaterinburger Zeit", "YEKT"}},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/TimeZoneNames_es.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/es/TimeZoneNames_es.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -276,6 +276,9 @@
String XJT[] = new String[] {"Hora est\u00e1ndar de China", "XJT",
"Hora de verano de China", "XJDT",
"Hora de China", "XJT"};
+ String YAKT[] = new String[] {"Hora de Yakutsk", "YAKT",
+ "Hora de verano de Yakutsk", "YAKST",
+ "Hora de Yakutsk", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -487,7 +490,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Hora est\u00e1ndar de Pierre & Miquelon", "PMST",
"Hora de verano de Pierre & Miquelon", "PMDT",
@@ -608,7 +611,7 @@
"Hora de verano de Brunei", "BNST",
"Hora de Brunei", "BNT"}},
{"Asia/Calcutta", IST},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Hora de Choibalsan", "CHOT",
"Hora de verano de Choibalsan", "CHOST",
"Hora de Choibalsan", "CHOT"}},
@@ -649,9 +652,7 @@
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Hora de Khandyga", "YAKT",
- "Hora de verano de Khandyga", "YAKST",
- "Hora de Khandyga", "YAKT"}},
+ {"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
@@ -717,9 +718,7 @@
{"Asia/Vladivostok", new String[] {"Hora de Vladivostok", "VLAT",
"Hora de verano de Vladivostok", "VLAST",
"Hora de Vladivostok", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"Hora de Yakutsk", "YAKT",
- "Hora de verano de Yakutsk", "YAKST",
- "Hora de Yakutsk", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Hora de Ekaterinburgo", "YEKT",
"Hora de verano de Ekaterinburgo", "YEKST",
"Hora de Ekaterinburgo", "YEKT"}},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/fr/TimeZoneNames_fr.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -276,6 +276,9 @@
String XJT[] = new String[] {"Heure normale de Chine", "XJT",
"Heure avanc\u00e9e de Chine", "XJDT",
"Chine", "XJT"};
+ String YAKT[] = new String[] {"Heure du Iakoutsk", "YAKT",
+ "Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST",
+ "Heure du Iakoutsk", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -487,7 +490,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Heure normale de Saint-Pierre et Miquelon", "PMST",
"Heure avanc\u00e9e de Saint-Pierre et Miquelon", "PMDT",
@@ -608,7 +611,7 @@
"Heure d'\u00e9t\u00e9 du Brunei", "BNST",
"Heure du Brunei", "BNT"}},
{"Asia/Calcutta", IST},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Heure de Choibalsan", "CHOT",
"Heure d'\u00e9t\u00e9 de Choibalsan", "CHOST",
"Heure de Choibalsan", "CHOT"}},
@@ -649,9 +652,7 @@
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Heure de Khandyga", "YAKT",
- "Heure d'\u00E9t\u00E9 de Khandyga", "YAKST",
- "Heure de Khandyga", "YAKT"}},
+ {"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
@@ -717,9 +718,7 @@
{"Asia/Vladivostok", new String[] {"Heure de Vladivostok", "VLAT",
"Heure d'\u00e9t\u00e9 de Vladivostok", "VLAST",
"Heure de Vladivostok", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"Heure du Iakoutsk", "YAKT",
- "Heure d'\u00e9t\u00e9 du Iakoutsk", "YAKST",
- "Heure du Iakoutsk", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Heure de Yekaterinburg", "YEKT",
"Heure d'\u00e9t\u00e9 de Yekaterinburg", "YEKST",
"Heure de Yekaterinburg", "YEKT"}},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/it/TimeZoneNames_it.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/it/TimeZoneNames_it.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -276,6 +276,9 @@
String XJT[] = new String[] {"Ora solare della Cina", "XJT",
"Ora legale della Cina", "XJDT",
"Ora Cina", "XJT"};
+ String YAKT[] = new String[] {"Ora di Jakutsk", "YAKT",
+ "Ora estiva di Jakutsk", "YAKST",
+ "Ora di Yakutsk", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -487,7 +490,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Ora solare di Saint-Pierre e Miquelon", "PMST",
"Ora legale di Saint-Pierre e Miquelon", "PMDT",
@@ -608,7 +611,7 @@
"Ora estiva del Brunei", "BNST",
"Ora del Brunei", "BNT"}},
{"Asia/Calcutta", IST},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Ora di Choibalsan", "CHOT",
"Ora estiva di Choibalsan", "CHOST",
"Ora di Choibalsan", "CHOT"}},
@@ -650,9 +653,7 @@
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
{"Asia/Kolkata", IST},
- {"Asia/Khandyga", new String[] {"Ora di Khandyga", "YAKT",
- "Ora estiva di Khandyga", "YAKST",
- "Ora di Khandyga", "YAKT"}},
+ {"Asia/Khandyga", YAKT},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
{"Asia/Kuching", MYT},
@@ -717,9 +718,7 @@
{"Asia/Vladivostok", new String[] {"Ora di Vladivostok", "VLAT",
"Ora estiva di Vladivostok", "VLAST",
"Ora di Vladivostok", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"Ora di Jakutsk", "YAKT",
- "Ora estiva di Jakutsk", "YAKST",
- "Ora di Yakutsk", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Ora di Ekaterinburg", "YEKT",
"Ora estiva di Ekaterinburg", "YEKST",
"Ora di Ekaterinburg", "YEKT"}},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ja/TimeZoneNames_ja.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -276,6 +276,9 @@
String XJT[] = new String[] {"\u4e2d\u56fd\u6a19\u6e96\u6642", "XJT",
"\u4e2d\u56fd\u590f\u6642\u9593", "XJDT",
"\u4E2D\u56FD\u6642\u9593", "XJT"};
+ String YAKT[] = new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT",
+ "\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST",
+ "\u30E4\u30AF\u30FC\u30C4\u30AF\u6642\u9593", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -487,7 +490,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u6a19\u6e96\u6642", "PMST",
"\u30b5\u30f3\u30d4\u30a8\u30fc\u30eb\u30fb\u30df\u30af\u30ed\u30f3\u8af8\u5cf6\u590f\u6642\u9593", "PMDT",
@@ -608,7 +611,7 @@
"\u30d6\u30eb\u30cd\u30a4\u590f\u6642\u9593", "BNST",
"\u30D6\u30EB\u30CD\u30A4\u6642\u9593", "BNT"}},
{"Asia/Calcutta", IST},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u6642\u9593", "CHOT",
"\u30c1\u30e7\u30a4\u30d0\u30eb\u30b5\u30f3\u590f\u6642\u9593", "CHOST",
"\u30C1\u30E7\u30A4\u30D0\u30EB\u30B5\u30F3\u6642\u9593", "CHOT"}},
@@ -649,9 +652,7 @@
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT",
- "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u590F\u6642\u9593", "YAKST",
- "\u30CF\u30F3\u30C9\u30A5\u30A4\u30AC\u6642\u9593", "YAKT"}},
+ {"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
@@ -717,9 +718,7 @@
{"Asia/Vladivostok", new String[] {"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u6642\u9593", "VLAT",
"\u30a6\u30e9\u30b8\u30aa\u30b9\u30c8\u30af\u590f\u6642\u9593", "VLAST",
"\u30A6\u30E9\u30B8\u30AA\u30B9\u30C8\u30AF\u6642\u9593", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"\u30e4\u30af\u30fc\u30c4\u30af\u6642\u9593", "YAKT",
- "\u30e4\u30af\u30fc\u30c4\u30af\u590f\u6642\u9593", "YAKST",
- "\u30E4\u30AF\u30FC\u30C4\u30AF\u6642\u9593", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"\u30a8\u30ab\u30c6\u30ea\u30f3\u30d6\u30eb\u30b0\u6642\u9593", "YEKT",
"\u30a8\u30ab\u30c6\u30ea\u30f3\u30d6\u30eb\u30b0\u590f\u6642\u9593", "YEKST",
"\u30A8\u30AB\u30C6\u30EA\u30F3\u30D6\u30EB\u30AF\u6642\u9593", "YEKT"}},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/ko/TimeZoneNames_ko.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -276,6 +276,9 @@
String XJT[] = new String[] {"\uc911\uad6d \ud45c\uc900\uc2dc", "XJT",
"\uc911\uad6d \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "XJDT",
"\uC911\uAD6D \uD45C\uC900\uC2DC", "XJT"};
+ String YAKT[] = new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT",
+ "\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST",
+ "\uC57C\uCFE0\uCE20\uD06C \uD45C\uC900\uC2DC", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -487,7 +490,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \ud45c\uc900\uc2dc", "PMST",
"\ud53c\uc5d0\ub974 \ubbf8\ud06c\ub860 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "PMDT",
@@ -608,7 +611,7 @@
"\ube0c\ub8e8\ub098\uc774 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "BNST",
"\uBE0C\uB8E8\uB098\uC774 \uD45C\uC900\uC2DC", "BNT"}},
{"Asia/Calcutta", IST},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Choibalsan \uc2dc\uac04", "CHOT",
"Choibalsan \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "CHOST",
"\uCD08\uC774\uBC1C\uC0B0 \uD45C\uC900\uC2DC", "CHOT"}},
@@ -649,9 +652,7 @@
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT",
- "\uD55C\uB514\uAC00 \uC77C\uAD11 \uC808\uC57D \uC2DC\uAC04", "YAKST",
- "\uD55C\uB514\uAC00 \uD45C\uC900\uC2DC", "YAKT"}},
+ {"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
@@ -717,9 +718,7 @@
{"Asia/Vladivostok", new String[] {"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc2dc\uac04", "VLAT",
"\ube14\ub77c\ub514\ubcf4\uc2a4\ud1a1 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "VLAST",
"\uBE14\uB77C\uB514\uBCF4\uC2A4\uD1A1 \uD45C\uC900\uC2DC", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"\uc57c\uce20\ud06c \uc2dc\uac04", "YAKT",
- "\uc57c\uce20\ud06c \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YAKST",
- "\uC57C\uCFE0\uCE20\uD06C \uD45C\uC900\uC2DC", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"\uc608\uce74\ud14c\ub9b0\ubc84\uadf8 \uc2dc\uac04", "YEKT",
"\uc608\uce74\ud14c\ub9b0\ubc84\uadf8 \uc77c\uad11\uc808\uc57d\uc2dc\uac04", "YEKST",
"\uC608\uCE74\uD14C\uB9B0\uBD80\uB974\uD06C \uD45C\uC900\uC2DC", "YEKT"}},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/BR/TimeZoneNames_pt_BR.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/pt/BR/TimeZoneNames_pt_BR.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -276,6 +276,9 @@
String XJT[] = new String[] {"Fuso hor\u00e1rio padr\u00e3o da China", "XJT",
"Hor\u00e1rio de luz natural da China", "XJDT",
"Hor\u00E1rio da China", "XJT"};
+ String YAKT[] = new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT",
+ "Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST",
+ "Hor\u00E1rio de Yakutsk", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -487,7 +490,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Fuso hor\u00e1rio padr\u00e3o de S\u00e3o Pedro e Miquelon", "PMST",
"Hor\u00e1rio de luz natural de S\u00e3o Pedro e Miquelon", "PMDT",
@@ -608,7 +611,7 @@
"Fuso hor\u00e1rio de ver\u00e3o de Brunei", "BNST",
"Hor\u00E1rio de Brunei", "BNT"}},
{"Asia/Calcutta", IST},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Fuso hor\u00e1rio de Choibalsan", "CHOT",
"Fuso hor\u00e1rio de ver\u00e3o de Choibalsan", "CHOST",
"Hor\u00E1rio de Choibalsan", "CHOT"}},
@@ -649,9 +652,7 @@
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Hor\u00E1rio de Khandyga", "YAKT",
- "Hor\u00E1rio de Ver\u00E3o de Khandyga", "YAKST",
- "Hor\u00E1rio de Khandyga", "YAKT"}},
+ {"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
@@ -717,9 +718,7 @@
{"Asia/Vladivostok", new String[] {"Fuso hor\u00e1rio de Vladivostok", "VLAT",
"Fuso hor\u00e1rio de ver\u00e3o de Vladivostok", "VLAST",
"Hor\u00E1rio de Vladivostok", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"Fuso hor\u00e1rio de Yakutsk", "YAKT",
- "Fuso hor\u00e1rio de ver\u00e3o de Yakutsk", "YAKST",
- "Hor\u00E1rio de Yakutsk", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Fuso hor\u00e1rio de Yekaterinburgo", "YEKT",
"Fuso hor\u00e1rio de ver\u00e3o de Yekaterinburgo", "YEKST",
"Hor\u00E1rio de Yekaterinburg", "YEKT"}},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/sv/TimeZoneNames_sv.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -276,6 +276,9 @@
String XJT[] = new String[] {"Kina, normaltid", "XJT",
"Kina, sommartid", "XJDT",
"Kinesisk tid", "XJT"};
+ String YAKT[] = new String[] {"Jakutsk, normaltid", "YAKT",
+ "Jakutsk, sommartid", "YAKST",
+ "Jakutsk-tid", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -487,7 +490,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"Saint-Pierre-et-Miquelon, normaltid", "PMST",
"Saint-Pierre-et-Miquelon, sommartid", "PMDT",
@@ -613,7 +616,7 @@
"Choibalsan-tid", "CHOT"}},
{"Asia/Chongqing", CTT},
{"Asia/Chungking", CTT},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Colombo", IST},
{"Asia/Dacca", BDT},
{"Asia/Dhaka", BDT},
@@ -649,9 +652,7 @@
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"Khandyga, normaltid", "YAKT",
- "Khandyga, sommartid", "YAKST",
- "Khandyga, normaltid", "YAKT"}},
+ {"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
@@ -717,9 +718,7 @@
{"Asia/Vladivostok", new String[] {"Vladivostok, normaltid", "VLAT",
"Vladivostok, sommartid", "VLAST",
"Vladivostok-tid", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"Jakutsk, normaltid", "YAKT",
- "Jakutsk, sommartid", "YAKST",
- "Jakutsk-tid", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Jekaterinburg, normaltid", "YEKT",
"Jekaterinburg, sommartid", "YEKST",
"Jekaterinburg-tid", "YEKT"}},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CN/TimeZoneNames_zh_CN.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/CN/TimeZoneNames_zh_CN.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -276,6 +276,9 @@
String XJT[] = new String[] {"\u4e2d\u56fd\u6807\u51c6\u65f6\u95f4", "XJT",
"\u4e2d\u56fd\u590f\u4ee4\u65f6", "XJDT",
"\u4E2D\u56FD\u65F6\u95F4", "XJT"};
+ String YAKT[] = new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT",
+ "\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST",
+ "\u4E9A\u5E93\u6B21\u514B\u65F6\u95F4", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -487,7 +490,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u6807\u51c6\u65f6\u95f4", "PMST",
"\u76ae\u57c3\u5c14\u5c9b\u53ca\u5bc6\u514b\u9686\u5c9b\u590f\u4ee4\u65f6", "PMDT",
@@ -608,7 +611,7 @@
"\u6587\u83b1\u590f\u4ee4\u65f6", "BNST",
"\u6587\u83B1\u65F6\u95F4", "BNT"}},
{"Asia/Calcutta", IST},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"Choibalsan \u65f6\u95f4", "CHOT",
"Choibalsan \u590f\u4ee4\u65f6", "CHOST",
"Choibalsan \u65F6\u95F4", "CHOT"}},
@@ -649,9 +652,7 @@
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT",
- "\u6C49\u5FB7\u52A0\u590F\u4EE4\u65F6", "YAKST",
- "\u6C49\u5FB7\u52A0\u65F6\u95F4", "YAKT"}},
+ {"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
@@ -717,9 +718,7 @@
{"Asia/Vladivostok", new String[] {"\u6d77\u53c2\u5d34\u65f6\u95f4", "VLAT",
"\u6d77\u53c2\u5d34\u590f\u4ee4\u65f6", "VLAST",
"\u6D77\u53C2\u5D34\u65F6\u95F4", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"\u4e9a\u5e93\u6b21\u514b\u65f6\u95f4", "YAKT",
- "\u4e9a\u5e93\u6b21\u514b\u590f\u4ee4\u65f6", "YAKST",
- "\u4E9A\u5E93\u6B21\u514B\u65F6\u95F4", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u65f6\u95f4", "YEKT",
"Yekaterinburg \u590f\u4ee4\u65f6", "YEKST",
"Yekaterinburg \u65F6\u95F4", "YEKT"}},
--- a/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TW/TimeZoneNames_zh_TW.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.localedata/share/classes/sun/util/resources/zh/TW/TimeZoneNames_zh_TW.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -276,6 +276,9 @@
String XJT[] = new String[] {"\u4e2d\u570b\u6a19\u6e96\u6642\u9593", "XJT",
"\u4e2d\u570b\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "XJDT",
"\u4E2D\u570B\u6642\u9593", "XJT"};
+ String YAKT[] = new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT",
+ "\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST",
+ "\u4E9E\u5EAB\u6B21\u514B\u6642\u9593", "YAKT"};
return new Object[][] {
{"America/Los_Angeles", PST},
@@ -487,7 +490,7 @@
{"America/Mendoza", AGT},
{"America/Menominee", CST},
{"America/Merida", CST},
- {"America/Metlakatla", PST},
+ {"America/Metlakatla", AKST},
{"America/Mexico_City", CST},
{"America/Miquelon", new String[] {"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u6a19\u6e96\u6642\u9593", "PMST",
"\u76ae\u57c3\u723e\u5cf6\u53ca\u5bc6\u514b\u9686\u5cf6\u65e5\u5149\u7bc0\u7d04\u6642\u9593", "PMDT",
@@ -608,7 +611,7 @@
"\u6c76\u840a\u590f\u4ee4\u6642\u9593", "BNST",
"\u6C76\u840A\u6642\u9593", "BNT"}},
{"Asia/Calcutta", IST},
- {"Asia/Chita", IRKT},
+ {"Asia/Chita", YAKT},
{"Asia/Choibalsan", new String[] {"\u5de7\u5df4\u5c71 (Choibalsan) \u6642\u9593", "CHOT",
"\u5de7\u5df4\u5c71 (Choibalsan) \u590f\u4ee4\u6642\u9593", "CHOST",
"\u5DE7\u5DF4\u5C71 (Choibalsan) \u6642\u9593", "CHOT"}},
@@ -649,9 +652,7 @@
{"Asia/Kashgar", XJT},
{"Asia/Kathmandu", NPT},
{"Asia/Katmandu", NPT},
- {"Asia/Khandyga", new String[] {"\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT",
- "\u6F22\u5730\u52A0 (Khandyga) \u590F\u4EE4\u6642\u9593", "YAKST",
- "\u6F22\u5730\u52A0 (Khandyga) \u6642\u9593", "YAKT"}},
+ {"Asia/Khandyga", YAKT},
{"Asia/Kolkata", IST},
{"Asia/Krasnoyarsk", KRAT},
{"Asia/Kuala_Lumpur", MYT},
@@ -719,9 +720,7 @@
{"Asia/Vladivostok", new String[] {"\u6d77\u53c3\u5d34\u6642\u9593", "VLAT",
"\u6d77\u53c3\u5d34\u590f\u4ee4\u6642\u9593", "VLAST",
"\u6D77\u53C3\u5D34\u6642\u9593", "VLAT"}},
- {"Asia/Yakutsk", new String[] {"\u4e9e\u5eab\u6b21\u514b\u6642\u9593", "YAKT",
- "\u4e9e\u5eab\u6b21\u514b\u590f\u4ee4\u6642\u9593", "YAKST",
- "\u4E9E\u5EAB\u6B21\u514B\u6642\u9593", "YAKT"}},
+ {"Asia/Yakutsk", YAKT},
{"Asia/Yekaterinburg", new String[] {"Yekaterinburg \u6642\u9593", "YEKT",
"Yekaterinburg \u590f\u4ee4\u6642\u9593", "YEKST",
"\u8449\u5361\u6377\u7433\u5821\u6642\u9593", "YEKT"}},
--- a/jdk/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/src/jdk.management/aix/native/libmanagement_ext/UnixOperatingSystem.c Thu Feb 11 16:06:51 2016 -0800
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2015 SAP AG. All rights reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/jdk/test/ProblemList.txt Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/ProblemList.txt Thu Feb 11 16:06:51 2016 -0800
@@ -133,6 +133,9 @@
# 8029891
java/lang/ClassLoader/deadlock/GetResource.java generic-all
+# 7008363
+java/lang/StringCoding/CheckEncodings.sh generic-all
+
############################################################################
# jdk_instrument
--- a/jdk/test/java/lang/ProcessBuilder/RedirectWithLongFilename.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/lang/ProcessBuilder/RedirectWithLongFilename.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 SAP SE. All Rights Reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/jdk/test/java/lang/String/concat/StringConcatFactoryInvariants.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/lang/String/concat/StringConcatFactoryInvariants.java Thu Feb 11 16:06:51 2016 -0800
@@ -66,7 +66,7 @@
private static final char TAG_CONST = '\u0002';
public static void main(String[] args) throws Throwable {
- MethodHandles.Lookup lookup = MethodHandles.publicLookup();
+ MethodHandles.Lookup lookup = MethodHandles.lookup();
String methodName = "foo";
MethodType mt = MethodType.methodType(String.class, String.class, int.class);
String recipe = "" + TAG_ARG + TAG_ARG + TAG_CONST;
@@ -236,6 +236,14 @@
// Advanced factory: test empty arguments
ok("Ok to pass empty arguments",
() -> StringConcatFactory.makeConcatWithConstants(lookup, methodName, mtEmpty, recipeEmpty));
+
+ // Simple factory: public Lookup is rejected
+ fail("Passing public Lookup",
+ () -> StringConcatFactory.makeConcat(MethodHandles.publicLookup(), methodName, mtEmpty));
+
+ // Advanced factory: public Lookup is rejected
+ fail("Passing public Lookup",
+ () -> StringConcatFactory.makeConcatWithConstants(MethodHandles.publicLookup(), methodName, mtEmpty, recipeEmpty));
}
public static void ok(String msg, Callable runnable) {
--- a/jdk/test/java/lang/System/OsVersionTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/lang/System/OsVersionTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 SAP SE. All Rights Reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/jdk/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/rmi/dgc/dgcAckFailure/DGCAckFailure.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, 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
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 4017232
+ * @bug 4017232 8046339
* @summary If, after returning a reference to a remote object in the current
* VM (which gets implicitly converted to a remote stub), the client fails to
* both send a DGC dirty call and to send a "DGC acknowledgment", the RMI
@@ -36,10 +36,14 @@
import java.io.*;
import java.net.*;
+import java.lang.reflect.Field;
import java.lang.ref.*;
import java.rmi.*;
import java.rmi.server.*;
+import java.util.Map;
+
+import sun.rmi.transport.DGCAckHandler;
interface ReturnRemote extends Remote {
Object returnRemote() throws RemoteException;
@@ -48,6 +52,7 @@
public class DGCAckFailure implements ReturnRemote {
private static final long TIMEOUT = 20000;
+ private static final long ACK_TIMEOUT = TIMEOUT / 2;
public Object returnRemote() {
return new Wrapper(this);
@@ -55,7 +60,8 @@
public static void main(String[] args) throws Exception {
- System.setProperty("sun.rmi.dgc.ackTimeout", "10000");
+ System.setProperty("sun.rmi.dgc.ackTimeout",
+ Long.toString(ACK_TIMEOUT));
/*
* Set a socket factory that has a hook for shutting down all client
@@ -93,12 +99,31 @@
break;
}
}
- if (ref == weakRef) {
- System.err.println("TEST PASSED");
- } else {
+ if (ref != weakRef) {
throw new RuntimeException("TEST FAILED: " +
"timed out, remote object not garbage collected");
}
+
+ // 8046339
+ // All DGCAckHandlers must be properly released after timeout
+ Thread.sleep(ACK_TIMEOUT + 100);
+ try {
+ Field field =
+ DGCAckHandler.class.getDeclaredField("idTable");
+ field.setAccessible(true);
+ Object obj = field.get(null);
+ Map<?,?> idTable = (Map<?,?>)obj;
+
+ if (!idTable.isEmpty()) {
+ throw new RuntimeException("TEST FAILED: " +
+ "DGCAckHandler.idTable isn't empty");
+ }
+ } catch (ReflectiveOperationException roe) {
+ throw new RuntimeException(roe);
+ }
+
+ System.err.println("TEST PASSED");
+
} finally {
try {
UnicastRemoteObject.unexportObject((Remote) weakRef.get(),
--- a/jdk/test/java/util/Arrays/TimSortStackSize2.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/Arrays/TimSortStackSize2.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -25,6 +25,8 @@
* @test
* @bug 8072909
* @library /lib/testlibrary /test/lib
+ * @modules java.management
+ * java.base/jdk.internal
* @build jdk.testlibrary.*
* @build TimSortStackSize2
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/jdk/test/java/util/Calendar/Bug6902861.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/Calendar/Bug6902861.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -25,6 +25,7 @@
* @test
* @bug 6902861
* @summary Test for a workaround when WEEK_OF_YEAR and YEAR are out of sync.
+ * @modules jdk.localedata
*/
import java.util.*;
--- a/jdk/test/java/util/Calendar/CldrFormatNamesTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/Calendar/CldrFormatNamesTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -26,6 +26,7 @@
* @bug 8004489 8006509 8008577
* @summary Unit test for CLDR FormatData resources
* @modules java.base/sun.util.locale.provider
+ * jdk.localedata
* @compile -XDignore.symbol.file CldrFormatNamesTest.java
* @run main/othervm -Djava.locale.providers=CLDR CldrFormatNamesTest
*/
--- a/jdk/test/java/util/Locale/Bug8001562.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/Locale/Bug8001562.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -26,6 +26,7 @@
* @bug 8001562
* @summary Verify that getAvailableLocales() in locale sensitive services
* classes return compatible set of locales as in JDK7.
+ * @modules jdk.localedata
* @run main Bug8001562
*/
--- a/jdk/test/java/util/Locale/HashCodeTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/Locale/HashCodeTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -24,6 +24,7 @@
* @test
* @bug 4944561
* @summary Test hashCode() to have less than 10% of hash code conflicts.
+ * @modules jdk.localedata
*/
import java.util.*;
--- a/jdk/test/java/util/Locale/InternationalBAT.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/Locale/InternationalBAT.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -26,6 +26,8 @@
* @summary Basic acceptance test for international J2RE. Verifies that the
* most important locale data and character converters exist and are
* minimally functional.
+ * @modules jdk.localedata
+ * jdk.charsets
* @run main/othervm -Djava.locale.providers=JRE,SPI InternationalBAT
*/
--- a/jdk/test/java/util/Locale/LocaleEnhanceTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/Locale/LocaleEnhanceTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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
@@ -46,6 +46,7 @@
* @bug 6875847 6992272 7002320 7015500 7023613 7032820 7033504 7004603
* 7044019 8008577
* @summary test API changes to Locale
+ * @modules jdk.localedata
* @compile LocaleEnhanceTest.java
* @run main/othervm -Djava.locale.providers=JRE,SPI -esa LocaleEnhanceTest
*/
--- a/jdk/test/java/util/Locale/LocaleTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/Locale/LocaleTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -27,6 +27,7 @@
* 4147315 4147317 4147552 4335196 4778440 4940539 5010672 6475525 6544471 6627549
* 6786276 7066203 7085757 8008577 8030696
* @summary test Locales
+ * @modules jdk.localedata
* @run main/othervm -Djava.locale.providers=JRE,SPI LocaleTest
*/
/*
--- a/jdk/test/java/util/Locale/ThaiGov.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/Locale/ThaiGov.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -24,7 +24,7 @@
* @test
* @bug 4474409
* @author John O'Conner
- *
+ * @modules jdk.localedata
*/
import java.util.*;
--- a/jdk/test/java/util/ResourceBundle/Bug6359330.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/ResourceBundle/Bug6359330.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -26,6 +26,7 @@
* @summary Make sure that getBundle doesn't cause a security error
* with a security manager when instantialing RBClassLoader (internal
* classloader).
+ * @modules java.xml
* @run main/othervm Bug6359330
*/
--- a/jdk/test/java/util/ResourceBundle/Control/Bug6530694.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/ResourceBundle/Control/Bug6530694.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -24,6 +24,7 @@
* @bug 6530694
* @summary Checks that sun.util.CoreResourceBundleControl does not apply
* to the application provided Swing resources.
+ * @modules java.desktop
* @run main/othervm -Djava.awt.headless=true Bug6530694
*/
--- a/jdk/test/java/util/Scanner/ScanTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/Scanner/ScanTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -27,6 +27,7 @@
* 8072722
* @summary Basic tests of java.util.Scanner methods
* @key randomness
+ * @modules jdk.localedata
* @run main/othervm ScanTest
*/
--- a/jdk/test/java/util/TimeZone/CLDRDisplayNamesTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/TimeZone/CLDRDisplayNamesTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -24,6 +24,7 @@
/*
* @test
* @bug 8005471 8008577 8129881 8130845 8136518
+ * @modules jdk.localedata
* @run main/othervm -Djava.locale.providers=CLDR CLDRDisplayNamesTest
* @summary Make sure that localized time zone names of CLDR are used
* if specified.
--- a/jdk/test/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/ConcurrentAssociateTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -46,6 +46,7 @@
* @run testng/timeout=1200 ConcurrentAssociateTest
* @summary Test that association operations, such as put and compute,
* place entries in the map
+ * @modules java.management
*/
@Test
public class ConcurrentAssociateTest {
--- a/jdk/test/java/util/concurrent/Phaser/Basic.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/concurrent/Phaser/Basic.java Thu Feb 11 16:06:51 2016 -0800
@@ -37,6 +37,7 @@
* @key intermittent
* @summary Basic tests for Phaser
* @author Chris Hegarty
+ * @modules java.management
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
--- a/jdk/test/java/util/concurrent/locks/LockSupport/ParkLoops.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/concurrent/locks/LockSupport/ParkLoops.java Thu Feb 11 16:06:51 2016 -0800
@@ -35,6 +35,7 @@
* @test
* @bug 8074773
* @summary Stress test looks for lost unparks
+ * @modules java.management
* @run main/timeout=1200 ParkLoops
*/
--- a/jdk/test/java/util/concurrent/tck/JSR166TestCase.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/concurrent/tck/JSR166TestCase.java Thu Feb 11 16:06:51 2016 -0800
@@ -36,6 +36,7 @@
/*
* @test
* @summary JSR-166 tck tests
+ * @modules java.management
* @build *
* @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
*/
--- a/jdk/test/java/util/logging/CustomLogManagerTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/CustomLogManagerTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @summary Add loggers to custom log manager
*
* @modules java.base/sun.util.logging
+ * java.logging
* @compile -XDignore.symbol.file CustomLogManagerTest.java CustomLogManager.java
* @run main/othervm -Djava.util.logging.manager=CustomLogManager CustomLogManagerTest
*/
--- a/jdk/test/java/util/logging/DrainFindDeadlockTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/DrainFindDeadlockTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,8 @@
* @bug 8010939
* @summary check for deadlock between findLogger() and drainLoggerRefQueueBounded()
* @author jim.gish@oracle.com
+ * @modules java.logging
+ * java.management
* @build DrainFindDeadlockTest
* @run main/othervm DrainFindDeadlockTest
* @key randomness
--- a/jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/LogManager/Configuration/TestConfigurationLock.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -46,6 +46,8 @@
* focuses more particularly on potential deadlock in
* drainLoggerRefQueueBounded / readConfiguration / reset
* todo: add at randomness
+ * @modules java.logging
+ * java.management
* @run main/othervm TestConfigurationLock
* @author danielfuchs
*/
--- a/jdk/test/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @bug 8026499
* @summary checks that Logger.getLogger("").setLevel() is working correctly.
* @modules java.base/sun.util.logging
+ * java.logging
* @build TestRootLoggerLevel
* @run main/othervm -Dtest.security=on TestRootLoggerLevel
* @run main/othervm -Dtest.security=off TestRootLoggerLevel
--- a/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,8 @@
* @summary check that when LogManager is initialized, a deadlock similar
* to that described in 8065709 will not occur.
* @modules java.base/jdk.internal.misc
+ * java.logging
+ * java.management
* @run main/othervm LogManagerAppContextDeadlock UNSECURE
* @run main/othervm LogManagerAppContextDeadlock SECURE
*
--- a/jdk/test/java/util/logging/LoggingDeadlock4.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/LoggingDeadlock4.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -27,6 +27,7 @@
* @summary Deadlock between LogManager.<clinit> and Logger.getLogger()
* @author Daniel D. Daugherty
* @modules java.base/sun.util.logging
+ * java.logging
* @compile -XDignore.symbol.file LoggingDeadlock4.java
* @run main/othervm/timeout=15 LoggingDeadlock4
*/
--- a/jdk/test/java/util/logging/LoggingMXBeanTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/LoggingMXBeanTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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
@@ -27,7 +27,8 @@
*
* @summary Basic Test for LoggingMXBean via MBeanServer
* @author Ron Mann
- *
+ * @modules java.logging
+ * java.management
* @build LoggingMXBeanTest
* @run main LoggingMXBeanTest
*/
--- a/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @summary Tests that setting .level=FINEST for the root logger in logging
* configuration file does work.
* @modules java.base/jdk.internal.misc
+ * java.logging
* @run main/othervm RootLevelInConfigFile
*
* @author danielfuchs
--- a/jdk/test/java/util/logging/SimpleLogManager.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/SimpleLogManager.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
* logger (see the subclassing information in the Logger class specification)
*
* @modules java.base/sun.util.logging
+ * java.logging
* @compile -XDignore.symbol.file CustomLogManager.java SimpleLogManager.java
* @run main/othervm -Djava.util.logging.manager=SimpleLogManager SimpleLogManager
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/logging/TEST.properties Thu Feb 11 16:06:51 2016 -0800
@@ -0,0 +1,1 @@
+modules = java.logging
--- a/jdk/test/java/util/logging/TestAppletLoggerContext.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/TestAppletLoggerContext.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* LogManager.getLogManager().getLogger
*
* @modules java.base/jdk.internal.misc
+ * java.logging
* @run main/othervm -Dtest.security=off TestAppletLoggerContext LoadingApplet
* @run main/othervm -Dtest.security=on TestAppletLoggerContext LoadingApplet
* @run main/othervm -Dtest.security=off TestAppletLoggerContext LoadingMain
--- a/jdk/test/java/util/logging/TestGetLoggerNPE.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/TestGetLoggerNPE.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @summary NPE with logging while launching webstart
*
* @modules java.base/jdk.internal.misc
+ * java.logging
* @build TestGetLoggerNPE
* @run main/othervm TestGetLoggerNPE getLogger
* @run main/othervm TestGetLoggerNPE getLogManager
--- a/jdk/test/java/util/logging/TestLogConfigurationDeadLock.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/TestLogConfigurationDeadLock.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,6 +38,8 @@
* @summary Synchronization issues in Logger and LogManager. This test
* focusses more particularly on potential deadlock in
* drainLoggerRefQueueBounded / readConfiguration
+ * @modules java.logging
+ * java.management
* @run main/othervm TestLogConfigurationDeadLock
* @author danielfuchs
*/
--- a/jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/TestLogConfigurationDeadLockWithConf.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,8 @@
* @bug 8027670 8029281
* @summary Deadlock in drainLoggerRefQueueBounded / readConfiguration
* caused by synchronization issues in Logger and LogManager.
+ * @modules java.logging
+ * java.management
* @run main/othervm TestLogConfigurationDeadLockWithConf
* @author danielfuchs
* @key randomness
--- a/jdk/test/java/util/logging/TestLoggerBundleSync.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/TestLoggerBundleSync.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,6 +53,8 @@
* java/util/logging/Logger/setResourceBundle/TestSetResourceBundle.java.
* Note that this is a best effort test. Running it in a loop to
* reproduce intermittent issues can be a good idea.
+ * @modules java.logging
+ * java.management
* @run main/othervm TestLoggerBundleSync
* @author danielfuchs
*/
--- a/jdk/test/java/util/logging/TestLoggerWeakRefLeak.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/TestLoggerWeakRefLeak.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, 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 @@
* @summary Check for WeakReference leak in Logger and anonymous Logger objects
* @library /lib/testlibrary
* @modules jdk.attach/sun.tools.attach
+ * java.logging
* @build jdk.testlibrary.ProcessTools
* @run main/othervm TestLoggerWeakRefLeak Logger
* @run main/othervm TestLoggerWeakRefLeak AnonymousLogger
--- a/jdk/test/java/util/logging/TestLoggingWithMainAppContext.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/TestLoggingWithMainAppContext.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,8 @@
* @summary Test that the default user context is used when in the main
* application context. This test must not be run in same VM or agent
* VM mode: it would not test the intended behavior.
+ * @modules java.desktop
+ * java.logging
* @run main/othervm TestLoggingWithMainAppContext
*/
public class TestLoggingWithMainAppContext {
--- a/jdk/test/java/util/logging/TestMainAppContext.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/logging/TestMainAppContext.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @summary checks that calling getLogger() from a Thread whose ThreadGroup is
* a child of the main root group doesn't throw an exception.
* @modules java.desktop/sun.awt
+ * java.logging
* @build TestMainAppContext
* @run main/othervm TestMainAppContext
* @author danielfuchs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/prefs/TEST.properties Thu Feb 11 16:06:51 2016 -0800
@@ -0,0 +1,1 @@
+modules = java.prefs
--- a/jdk/test/java/util/zip/ZipCoding.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/zip/ZipCoding.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
@@ -25,6 +25,7 @@
* @test
* @bug 4244499 4532049 4700978 4820807 4980042
* @summary Test ZipInputStream, ZipOutputStream and ZipFile with non-UTF8 encoding
+ * @modules jdk.charsets
*/
import java.io.*;
--- a/jdk/test/java/util/zip/ZipFile/DeleteTempJar.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/java/util/zip/ZipFile/DeleteTempJar.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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
@@ -26,6 +26,7 @@
@summary Make sure URL-downloaded jar files (jar_cache files)
will be deleted when VM exits.
+ @modules jdk.httpserver
@build DeleteTempJar
@run shell deletetempjar.sh
*/
--- a/jdk/test/javax/xml/jaxp/parsers/8027359/FragmentScannerBufferLimitTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/javax/xml/jaxp/parsers/8027359/FragmentScannerBufferLimitTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright 2014, SAP AG. All rights reserved.
+ * Copyright (c) 2014 SAP SE. 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
--- a/jdk/test/jdk/internal/jimage/ExecutableTest.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/jdk/internal/jimage/ExecutableTest.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 SAP SE. All Rights Reserved.
+ * Copyright (c) 2015 SAP SE. 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
--- a/jdk/test/sun/security/smartcardio/TestChannel.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/TestChannel.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,11 @@
public static void main(String[] args) throws Exception {
CardTerminal terminal = getTerminal(args);
+ if (terminal == null) {
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
+ }
// establish a connection with the card
Card card = terminal.connect("T=0");
--- a/jdk/test/sun/security/smartcardio/TestConnect.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/TestConnect.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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
@@ -40,23 +40,12 @@
public class TestConnect extends Utils {
public static void main(String[] args) throws Exception {
- TerminalFactory factory = TerminalFactory.getInstance("PC/SC", null, "SunPCSC");
- System.out.println(factory);
-
- List<CardTerminal> terminals = factory.terminals().list();
- System.out.println("Terminals: " + terminals);
- if (terminals.isEmpty()) {
- throw new Exception("No card terminals available");
+ CardTerminal terminal = getTerminal(args, "SunPCSC");
+ if (terminal == null) {
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
}
- CardTerminal terminal = terminals.get(0);
-
- if (terminal.isCardPresent() == false) {
- System.out.println("*** Insert card");
- if (terminal.waitForCardPresent(20 * 1000) == false) {
- throw new Exception("no card available");
- }
- }
- System.out.println("card present: " + terminal.isCardPresent());
Card card = terminal.connect("*");
System.out.println("card: " + card);
--- a/jdk/test/sun/security/smartcardio/TestConnectAgain.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/TestConnectAgain.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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
@@ -40,6 +40,11 @@
public static void main(String[] args) throws Exception {
CardTerminal terminal = getTerminal(args);
+ if (terminal == null) {
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
+ }
Card card = terminal.connect("T=0");
CardChannel channel = card.getBasicChannel();
--- a/jdk/test/sun/security/smartcardio/TestControl.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/TestControl.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,6 +41,11 @@
public static void main(String[] args) throws Exception {
CardTerminal terminal = getTerminal(args);
+ if (terminal == null) {
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
+ }
// establish a connection with the card
Card card = terminal.connect("T=0");
--- a/jdk/test/sun/security/smartcardio/TestDefault.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/TestDefault.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,10 +41,12 @@
TerminalFactory factory = TerminalFactory.getDefault();
System.out.println("Type: " + factory.getType());
List<CardTerminal> terminals = factory.terminals().list();
+ if (terminals.isEmpty()) {
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
+ }
System.out.println("Terminals: " + terminals);
- if (terminals.isEmpty()) {
- throw new Exception("no terminals");
- }
System.out.println("OK.");
}
--- a/jdk/test/sun/security/smartcardio/TestDirect.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/TestDirect.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -40,10 +40,12 @@
public static void main(String[] args) throws Exception {
TerminalFactory terminalFactory = TerminalFactory.getDefault();
List<CardTerminal> cardTerminals = terminalFactory.terminals().list();
+ if (cardTerminals.isEmpty()) {
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
+ }
System.out.println("Terminals: " + cardTerminals);
- if (cardTerminals.isEmpty()) {
- throw new Exception("No card terminals available");
- }
CardTerminal cardTerminal = cardTerminals.get(0);
Card card = cardTerminal.connect("DIRECT");
card.disconnect(true);
--- a/jdk/test/sun/security/smartcardio/TestExclusive.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/TestExclusive.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,11 @@
public static void main(String[] args) throws Exception {
CardTerminal terminal = getTerminal(args);
+ if (terminal == null) {
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
+ }
// establish a connection with the card
Card card = terminal.connect("T=0");
--- a/jdk/test/sun/security/smartcardio/TestMultiplePresent.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/TestMultiplePresent.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,12 @@
public static void main(String[] args) throws Exception {
Utils.setLibrary(args);
- TerminalFactory factory = TerminalFactory.getInstance("PC/SC", null);
+ TerminalFactory factory = Utils.getTerminalFactory(null);
+ if (factory == null) {
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
+ }
System.out.println(factory);
CardTerminals terminals = factory.terminals();
@@ -50,7 +55,9 @@
boolean multipleReaders = true;
if (list.size() < 2) {
if (list.isEmpty()) {
- throw new Exception("no terminals");
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
}
System.out.println("Only one reader present, using simplified test");
multipleReaders = false;
--- a/jdk/test/sun/security/smartcardio/TestPresent.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/TestPresent.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,7 +35,7 @@
import javax.smartcardio.CardTerminal;
import javax.smartcardio.TerminalFactory;
-public class TestPresent {
+public class TestPresent extends Utils {
private static class Timer {
private long time = System.currentTimeMillis();
@@ -67,15 +67,12 @@
}
public static void main(String[] args) throws Exception {
- TerminalFactory factory = TerminalFactory.getInstance("PC/SC", null);
- System.out.println(factory);
-
- List<CardTerminal> terminals = factory.terminals().list();
- System.out.println("Terminals: " + terminals);
- if (terminals.isEmpty()) {
- throw new Exception("No card terminals available");
+ CardTerminal terminal = getTerminal(args);
+ if (terminal == null) {
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
}
- CardTerminal terminal = terminals.get(0);
while (terminal.isCardPresent()) {
System.out.println("*** Remove card!");
--- a/jdk/test/sun/security/smartcardio/TestTransmit.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/TestTransmit.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,11 @@
public static void main(String[] args) throws Exception {
CardTerminal terminal = getTerminal(args);
+ if (terminal == null) {
+ System.out.println("Skipping the test: " +
+ "no card terminals available");
+ return;
+ }
Card card = terminal.connect("T=0");
CardChannel channel = card.getBasicChannel();
--- a/jdk/test/sun/security/smartcardio/Utils.java Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/security/smartcardio/Utils.java Thu Feb 11 16:06:51 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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
@@ -27,6 +27,7 @@
import java.io.StringReader;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.List;
import javax.smartcardio.CardTerminal;
@@ -43,26 +44,59 @@
}
}
+ static TerminalFactory getTerminalFactory(String provName) throws Exception {
+ try {
+ TerminalFactory factory = (provName == null)
+ ? TerminalFactory.getInstance("PC/SC", null)
+ : TerminalFactory.getInstance("PC/SC", null, provName);
+ System.out.println(factory);
+ return factory;
+ } catch (NoSuchAlgorithmException e) {
+ Throwable cause = e.getCause();
+ if (cause != null && cause.getMessage().startsWith("PC/SC not available")) {
+ return null;
+ }
+ throw e;
+ }
+ }
+
static CardTerminal getTerminal(String[] args) throws Exception {
+ return getTerminal(args, null);
+ }
+
+ static CardTerminal getTerminal(String[] args, String provider) throws Exception {
setLibrary(args);
- TerminalFactory factory = TerminalFactory.getInstance("PC/SC", null);
- System.out.println(factory);
+ try {
+ TerminalFactory factory = (provider == null)
+ ? TerminalFactory.getInstance("PC/SC", null)
+ : TerminalFactory.getInstance("PC/SC", null, provider);
+ System.out.println(factory);
+
+ List<CardTerminal> terminals = factory.terminals().list();
+ System.out.println("Terminals: " + terminals);
+ if (terminals.isEmpty()) {
+ return null;
+ }
+ CardTerminal terminal = terminals.get(0);
- List<CardTerminal> terminals = factory.terminals().list();
- System.out.println("Terminals: " + terminals);
- if (terminals.isEmpty()) {
- throw new Exception("No card terminals available");
+ if (terminal.isCardPresent() == false) {
+ System.out.println("*** Insert card");
+ if (terminal.waitForCardPresent(20 * 1000) == false) {
+ throw new Exception("no card available");
+ }
+ }
+ System.out.println("card present: " + terminal.isCardPresent());
+
+ return terminal;
+
+ } catch (NoSuchAlgorithmException e) {
+ Throwable cause = e.getCause();
+ if (cause != null && cause.getMessage().startsWith("PC/SC not available")) {
+ return null;
+ }
+ throw e;
}
- CardTerminal terminal = terminals.get(0);
-
- if (terminal.isCardPresent() == false) {
- System.out.println("*** Insert card");
- if (terminal.waitForCardPresent(20 * 1000) == false) {
- throw new Exception("no card available");
- }
- }
- return terminal;
}
static final byte[] C1 = parse("00 A4 04 00 07 A0 00 00 00 62 81 01 00");
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION Thu Feb 11 16:06:51 2016 -0800
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2015g
+tzdata2016a
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia Thu Feb 11 16:06:51 2016 -0800
@@ -897,6 +897,15 @@
9:00 - TLT
# India
+
+# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
+# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
+# (2015-12-22):
+# In January 1906, several thousand cotton-mill workers rioted on the
+# outskirts of Bombay.... They were protesting the proposed abolition of
+# local time in favor of Indian Standard Time.... Journalists called this
+# dispute the "Battle of the Clocks." It lasted nearly half a century.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Kolkata 5:53:28 - LMT 1880 # Kolkata
5:53:20 - HMT 1941 Oct # Howrah Mean Time?
@@ -1107,8 +1116,15 @@
Rule Iran 2032 2033 - Sep 21 0:00 0 S
Rule Iran 2034 2035 - Mar 22 0:00 1:00 D
Rule Iran 2034 2035 - Sep 22 0:00 0 S
-Rule Iran 2036 2037 - Mar 21 0:00 1:00 D
-Rule Iran 2036 2037 - Sep 21 0:00 0 S
+#
+# The following rules are approximations starting in the year 2038.
+# These are the best post-2037 approximations available, given the
+# restrictions of a single rule using a Gregorian-based data format.
+# At some point this table will need to be extended, though quite
+# possibly Iran will change the rules first.
+Rule Iran 2036 max - Mar 21 0:00 1:00 D
+Rule Iran 2036 max - Sep 21 0:00 0 S
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Tehran 3:25:44 - LMT 1916
3:25:44 - TMT 1946 # Tehran Mean Time
@@ -2134,8 +2150,8 @@
# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Pakistan 2002 only - Apr Sun>=2 0:01 1:00 S
-Rule Pakistan 2002 only - Oct Sun>=2 0:01 0 -
+Rule Pakistan 2002 only - Apr Sun>=2 0:00 1:00 S
+Rule Pakistan 2002 only - Oct Sun>=2 0:00 0 -
Rule Pakistan 2008 only - Jun 1 0:00 1:00 S
Rule Pakistan 2008 2009 - Nov 1 0:00 0 -
Rule Pakistan 2009 only - Apr 15 0:00 1:00 S
--- a/jdk/test/sun/util/calendar/zi/tzdata/backward Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/backward Thu Feb 11 16:06:51 2016 -0800
@@ -46,6 +46,7 @@
Link America/Toronto America/Montreal
Link America/Rio_Branco America/Porto_Acre
Link America/Argentina/Cordoba America/Rosario
+Link America/Tijuana America/Santa_Isabel
Link America/Denver America/Shiprock
Link America/Port_of_Spain America/Virgin
Link Pacific/Auckland Antarctica/South_Pole
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe Thu Feb 11 16:06:51 2016 -0800
@@ -2616,13 +2616,20 @@
# Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
# Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
+# From Alexander Krivenyshev (2016-01-02):
+# [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
+# Asia/Chita [is changing] from UTC+8 to UTC+9. Effective date will
+# be March 27, 2016 at 2:00am....
+# http://publication.pravo.gov.ru/Document/View/000120151230010
+
Zone Asia/Chita 7:33:52 - LMT 1919 Dec 15
8:00 - YAKT 1930 Jun 21 # Yakutsk Time
9:00 Russia YAK%sT 1991 Mar 31 2:00s
8:00 Russia YAK%sT 1992 Jan 19 2:00s
9:00 Russia YAK%sT 2011 Mar 27 2:00s
10:00 - YAKT 2014 Oct 26 2:00s
- 8:00 - IRKT
+ 8:00 - IRKT 2016 Mar 27 2:00
+ 9:00 - YAKT
# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
@@ -3177,6 +3184,12 @@
# It's officially announced now by the Ministry of Energy.
# Turkey delays winter time to 8th of November 04:00
# http://www.aa.com.tr/tr/turkiye/yaz-saati-uygulamasi-8-kasimda-sona-erecek/362217
+#
+# From BBC News (2015-10-25):
+# Confused Turks are asking "what's the time?" after automatic clocks defied a
+# government decision ... "For the next two weeks #Turkey is on EEST... Erdogan
+# Engineered Standard Time," said Twitter user @aysekarahasan.
+# http://www.bbc.com/news/world-europe-34631326
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Turkey 1916 only - May 1 0:00 1:00 S
--- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/northamerica Thu Feb 11 16:06:51 2016 -0800
@@ -348,6 +348,16 @@
# Statue 175 closer in synch with the US Congress' intent....
# http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
+# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
+# Fort Pierre is technically located in the Mountain time zone as is
+# the rest of Stanley County. Most of Stanley County and Fort Pierre
+# uses the Central time zone due to doing most of their business in
+# Pierre so it simplifies schedules. I have lived in Stanley County
+# all my life and it has been that way since I can remember. (43 years!)
+#
+# From Paul Eggert (2015-12-25):
+# Assume this practice predates 1970, so Fort Pierre can use America/Chicago.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule Chicago 1920 only - Jun 13 2:00 1:00 D
Rule Chicago 1920 1921 - Oct lastSun 2:00 0 S
@@ -504,6 +514,12 @@
# For lack of better information, assume that Metlakatla's
# abandonment of use of daylight saving resulted from the 1983 vote.
+# From Steffen Thorsen (2015-11-09):
+# It seems Metlakatla did go off PST on Sunday, November 1, changing
+# their time to AKST and are going to follow Alaska's DST, switching
+# between AKST and AKDT from now on....
+# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Juneau 15:02:19 - LMT 1867 Oct 18
-8:57:41 - LMT 1900 Aug 20 12:00
@@ -529,7 +545,8 @@
-8:00 US P%sT 1946
-8:00 - PST 1969
-8:00 US P%sT 1983 Oct 30 2:00
- -8:00 - PST
+ -8:00 - PST 2015 Nov 1 2:00
+ -9:00 US AK%sT
Zone America/Yakutat 14:41:05 - LMT 1867 Oct 18
-9:18:55 - LMT 1900 Aug 20 12:00
-9:00 - YST 1942
@@ -2610,25 +2627,6 @@
-8:00 US P%sT 2002 Feb 20
-8:00 Mexico P%sT 2010
-8:00 US P%sT
-# Baja California (away from US border)
-Zone America/Santa_Isabel -7:39:28 - LMT 1922 Jan 1 0:20:32
- -7:00 - MST 1924
- -8:00 - PST 1927 Jun 10 23:00
- -7:00 - MST 1930 Nov 15
- -8:00 - PST 1931 Apr 1
- -8:00 1:00 PDT 1931 Sep 30
- -8:00 - PST 1942 Apr 24
- -8:00 1:00 PWT 1945 Aug 14 23:00u
- -8:00 1:00 PPT 1945 Nov 12 # Peace
- -8:00 - PST 1948 Apr 5
- -8:00 1:00 PDT 1949 Jan 14
- -8:00 - PST 1954
- -8:00 CA P%sT 1961
- -8:00 - PST 1976
- -8:00 US P%sT 1996
- -8:00 Mexico P%sT 2001
- -8:00 US P%sT 2002 Feb 20
- -8:00 Mexico P%sT
# From Paul Eggert (2006-03-22):
# Formerly there was an America/Ensenada zone, which differed from
# America/Tijuana only in that it did not observe DST from 1976
@@ -2641,6 +2639,13 @@
# other than America/Tijuana for Baja, but it's not clear yet what its
# name or contents should be.
#
+# From Paul Eggert (2015-10-08):
+# Formerly there was an America/Santa_Isabel zone, but this appears to
+# have come from a misreading of
+# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
+# It has been moved to the 'backward' file.
+#
+#
# Revillagigedo Is
# no information
@@ -2715,17 +2720,7 @@
-4:00 US A%sT
# Cayman Is
-
-# From Paul Eggert (2015-05-15):
-# The Cayman government has decided to introduce DST in 2016, the idea being
-# to keep in sync with New York. The legislation hasn't passed but the change
-# seems quite likely. See: Meade B. Cayman 27.
-# http://www.cayman27.com.ky/2015/05/15/clock-ticks-toward-daylight-saving-time-in-cayman
-
-Zone America/Cayman -5:25:32 - LMT 1890 # Georgetown
- -5:07:11 - KMT 1912 Feb # Kingston Mean Time
- -5:00 - EST 2016
- -5:00 US E%sT
+# See America/Panama.
# Costa Rica
@@ -3248,6 +3243,7 @@
Zone America/Panama -5:18:08 - LMT 1890
-5:19:36 - CMT 1908 Apr 22 # Colón Mean Time
-5:00 - EST
+Link America/Panama America/Cayman
# Puerto Rico
# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
--- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab Thu Feb 11 14:40:00 2016 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab Thu Feb 11 16:06:51 2016 -0800
@@ -306,8 +306,7 @@
MX +2838-10605 America/Chihuahua Mexican Mountain Time - Chihuahua away from US border
MX +2934-10425 America/Ojinaga US Mountain Time - Chihuahua near US border
MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora
-MX +3232-11701 America/Tijuana US Pacific Time - Baja California near US border
-MX +3018-11452 America/Santa_Isabel Mexican Pacific Time - Baja California away from US border
+MX +3232-11701 America/Tijuana US Pacific Time - Baja California state
MX +2048-10515 America/Bahia_Banderas Mexican Central Time - Bahia de Banderas
MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia
MY +0133+11020 Asia/Kuching Sabah & Sarawak
@@ -437,10 +436,10 @@
US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon
US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona (except Navajo)
US +340308-1181434 America/Los_Angeles Pacific Time
-US +550737-1313435 America/Metlakatla Pacific Standard Time - Annette Island, Alaska
US +611305-1495401 America/Anchorage Alaska Time
US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle
US +571035-1351807 America/Sitka Alaska Time - southeast Alaska panhandle
+US +550737-1313435 America/Metlakatla Alaska Time - Annette Island
US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck
US +643004-1652423 America/Nome Alaska Time - west Alaska
US +515248-1763929 America/Adak Aleutian Islands