--- a/jdk/.hgtags Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/.hgtags Fri Nov 21 14:58:29 2014 -0800
@@ -282,3 +282,4 @@
27c3345d6dce39a22c262f30bb1f0e0b00c3709e jdk9-b37
d2d745313c81d1fc01f426983b9f784ab1f750e8 jdk9-b38
ca6edf957fe1c6ea818530b503578e872cea7239 jdk9-b39
+f1ed1540da70a066527fd043413107e47721edbf jdk9-b40
--- a/jdk/make/CompileDemos.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/CompileDemos.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -44,7 +44,7 @@
DEMO_SHARE_SRC := $(JDK_TOPDIR)/src/demo/share
DEMO_CLOSED_SHARE_SRC := $(JDK_TOPDIR)/src/closed/demo/share
DEMO_SOLARIS_SRC := $(JDK_TOPDIR)/src/demo/solaris
-DEMO_OS_API_SRC := $(JDK_TOPDIR)/src/demo/$(OPENJDK_TARGET_OS_API_DIR)
+DEMO_OS_TYPE_SRC := $(JDK_TOPDIR)/src/demo/$(OPENJDK_TARGET_OS_TYPE)
VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc
##################################################################################################
@@ -214,13 +214,13 @@
# Param 2 = add these directories to the includes, default is agent_util
# Param 3 = extra CFLAGS
# Param 4 = C or C++ (defaults to C)
- # Param 5 = libs for posix
+ # Param 5 = libs for unix
# Param 6 = libs for windows
# Param 7 = libs for solaris
# Param 8 = libs for linux
# Param 9 = extra directories with required sources
BUILD_DEMO_JVMTI_$1_EXTRA_SRC := \
- $$(wildcard $(DEMO_OS_API_SRC)/jvmti/$1) \
+ $$(wildcard $(DEMO_OS_TYPE_SRC)/jvmti/$1) \
$$(wildcard $$(addprefix $(DEMO_SHARE_SRC)/jvmti/, $2)) \
$9
BUILD_DEMO_JVMTI_$1_EXTRA_SRC_EXCLUDE := \
@@ -257,7 +257,7 @@
LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
- LDFLAGS_SUFFIX_posix := $5, \
+ LDFLAGS_SUFFIX_unix := $5, \
LDFLAGS_SUFFIX_windows := $6, \
LDFLAGS_SUFFIX_solaris := $7 -lc, \
LDFLAGS_SUFFIX_linux := $8, \
--- a/jdk/make/CreateJars.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/CreateJars.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -656,7 +656,7 @@
SRC_ZIP_SRCS := $(wildcard \
$(JDK_TOPDIR)/src/*/share/classes \
$(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS)/classes \
- $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS_API_DIR)/classes \
+ $(JDK_TOPDIR)/src/*/$(OPENJDK_TARGET_OS_TYPE)/classes \
$(LANGTOOLS_TOPDIR)/src/*/share/classes \
$(CORBA_TOPDIR)/src/*/share/classes \
$(JAXP_TOPDIR)/src/*/share/classes \
@@ -679,7 +679,7 @@
FILES := $(wildcard \
$(JDK_TOPDIR)/src/java.base/share/native/launcher/* \
$(JDK_TOPDIR)/src/java.base/share/native/libjli/* \
- $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli/java_md*)))
+ $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli/java_md*)))
LAUNCHER_ZIP_SRC := $(COPY_LAUNCHER_SRC)
--- a/jdk/make/Import.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/Import.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -30,8 +30,8 @@
################################################################################
-# Put the libraries here. Different locations for different target apis.
-ifeq ($(OPENJDK_TARGET_OS_API), posix)
+# Put the libraries here. Different locations for different target OS types.
+ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
HOTSPOT_LIB_DIR := $(HOTSPOT_DIST)/jre/lib$(OPENJDK_TARGET_CPU_LIBDIR)
else
--- a/jdk/make/copy/Copy-java.base.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/copy/Copy-java.base.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -83,7 +83,7 @@
ifeq ($(OPENJDK_TARGET_OS), macosx)
JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
else
- JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/conf/$(JVMCFG_ARCH)/jvm.cfg
+ JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
endif
JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
JVMCFG := $(JVMCFG_DIR)/jvm.cfg
@@ -190,7 +190,7 @@
NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/net.properties
ifeq ($(OPENJDK_TARGET_OS), solaris)
- $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/java.base/${OPENJDK_TARGET_OS_API_DIR}/conf/sdp/sdp.conf.template
+ $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template
$(ECHO) $(LOG_INFO) Copying $(@F)
$(call install-file)
--- a/jdk/make/copy/Copy-java.desktop.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/copy/Copy-java.desktop.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -102,13 +102,13 @@
# Copy cursor.properties and cursors gif files to LIB_DST_DIR
#
ifneq ($(OPENJDK_TARGET_OS), macosx)
- OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf
+ OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/conf
else
OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/conf
endif
CURSORS_DEST_DIR := $(LIB_DST_DIR)/images/cursors
-CURSORS_OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf/images/cursors
+CURSORS_OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/conf/images/cursors
$(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties
$(call install-file)
--- a/jdk/make/data/tzdata/VERSION Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/data/tzdata/VERSION Fri Nov 21 14:58:29 2014 -0800
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2014i
+tzdata2014j
--- a/jdk/make/data/tzdata/africa Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/data/tzdata/africa Fri Nov 21 14:58:29 2014 -0800
@@ -29,20 +29,19 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2014-10-31):
#
-# A good source for time zone historical data outside the U.S. is
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# Another source occasionally used is Edward W. Whitman, World Time Differences,
# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
@@ -88,7 +87,6 @@
# 3:00 CAST Central Africa Summer Time (no longer used)
# 3:00 SAST South Africa Summer Time (no longer used)
# 3:00 EAT East Africa Time
-# 4:00 EAST East Africa Summer Time (no longer used)
# Algeria
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -169,9 +167,7 @@
1:00 - WAT
# Comoros
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro
- 3:00 - EAT
+# See Africa/Nairobi.
# Democratic Republic of the Congo
# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
@@ -195,9 +191,7 @@
Link Africa/Abidjan Atlantic/St_Helena # St Helena
# Djibouti
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul
- 3:00 - EAT
+# See Africa/Nairobi.
###############################################################################
@@ -410,27 +404,8 @@
# See Africa/Lagos.
# Eritrea
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Asmara 2:35:32 - LMT 1870
- 2:35:32 - AMT 1890 # Asmara Mean Time
- 2:35:20 - ADMT 1936 May 5 # Adis Dera MT
- 3:00 - EAT
-
# Ethiopia
-# From Paul Eggert (2014-07-31):
-# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
-# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
-# 02:00 or 14:00. Keep this in mind when you ask the time in Amharic.
-#
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
-# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
-# 1890, and that they switched to 3:00 on 1936-05-05. Perhaps 38E50
-# was for Adis Dera. Quite likely the Shanks data entries are wrong
-# anyway.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Addis_Ababa 2:34:48 - LMT 1870
- 2:35:20 - ADMT 1936 May 5 # Adis Dera MT
- 3:00 - EAT
+# See Africa/Nairobi.
# Gabon
# See Africa/Lagos.
@@ -474,6 +449,15 @@
2:30 - BEAT 1940
2:45 - BEAUT 1960
3:00 - EAT
+Link Africa/Nairobi Africa/Addis_Ababa # Ethiopia
+Link Africa/Nairobi Africa/Asmara # Eritrea
+Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
+Link Africa/Nairobi Africa/Djibouti
+Link Africa/Nairobi Africa/Kampala # Uganda
+Link Africa/Nairobi Africa/Mogadishu # Somalia
+Link Africa/Nairobi Indian/Antananarivo # Madagascar
+Link Africa/Nairobi Indian/Comoro
+Link Africa/Nairobi Indian/Mayotte
# Lesotho
# See Africa/Johannesburg.
@@ -551,11 +535,7 @@
2:00 - EET
# Madagascar
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Antananarivo 3:10:04 - LMT 1911 Jul
- 3:00 - EAT 1954 Feb 27 23:00s
- 3:00 1:00 EAST 1954 May 29 23:00s
- 3:00 - EAT
+# See Africa/Nairobi.
# Malawi
# See Africa/Maputo.
@@ -658,9 +638,7 @@
# no information; probably like Indian/Mauritius
# Mayotte
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
- 3:00 - EAT
+# See Africa/Nairobi.
# Morocco
# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
@@ -1072,11 +1050,7 @@
# See Africa/Abidjan.
# Somalia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Mogadishu 3:01:28 - LMT 1893 Nov
- 3:00 - EAT 1931
- 2:30 - BEAT 1957
- 3:00 - EAT
+# See Africa/Nairobi.
# South Africa
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -1119,11 +1093,7 @@
# See Africa/Johannesburg.
# Tanzania
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Dar_es_Salaam 2:37:08 - LMT 1931
- 3:00 - EAT 1948
- 2:45 - BEAUT 1961
- 3:00 - EAT
+# See Africa/Nairobi.
# Togo
# See Africa/Abidjan.
@@ -1229,12 +1199,7 @@
1:00 Tunisia CE%sT
# Uganda
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Kampala 2:09:40 - LMT 1928 Jul
- 3:00 - EAT 1930
- 2:30 - BEAT 1948
- 2:45 - BEAUT 1957
- 3:00 - EAT
+# See Africa/Nairobi.
# Zambia
# Zimbabwe
--- a/jdk/make/data/tzdata/asia Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/data/tzdata/asia Fri Nov 21 14:58:29 2014 -0800
@@ -29,20 +29,19 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2013-08-11):
+# From Paul Eggert (2014-10-31):
#
-# A good source for time zone historical data outside the U.S. is
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# Another source occasionally used is Edward W. Whitman, World Time Differences,
# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
@@ -1686,44 +1685,70 @@
# Korea (North and South)
# From Annie I. Bang (2006-07-10):
-# http://www.koreaherald.co.kr/SITE/data/html_dir/2006/07/10/200607100012.asp
-# The Ministry of Commerce, Industry and Energy has already
-# commissioned a research project [to reintroduce DST] and has said
-# the system may begin as early as 2008.... Korea ran a daylight
-# saving program from 1949-61 but stopped it during the 1950-53 Korean War.
+# http://www.koreaherald.com/view.php?ud=200607100012
+# Korea ran a daylight saving program from 1949-61 but stopped it
+# during the 1950-53 Korean War. The system was temporarily enforced
+# between 1987 and 1988 ...
-# From Shanks & Pottenger:
+# From Sanghyuk Jung (2014-10-29):
+# http://mm.icann.org/pipermail/tz/2014-October/021830.html
+# According to the Korean Wikipedia
+# http://ko.wikipedia.org/wiki/한국_표준시
+# [oldid=12896437 2014-09-04 08:03 UTC]
+# DST in Republic of Korea was as follows.... And I checked old
+# newspapers in Korean, all articles correspond with data in Wikipedia.
+# For example, the article in 1948 (Korean Language) proved that DST
+# started at June 1 in that year. For another example, the article in
+# 1988 said that DST started at 2:00 AM in that year.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule ROK 1960 only - May 15 0:00 1:00 D
-Rule ROK 1960 only - Sep 13 0:00 0 S
-Rule ROK 1987 1988 - May Sun>=8 0:00 1:00 D
-Rule ROK 1987 1988 - Oct Sun>=8 0:00 0 S
+Rule ROK 1948 only - Jun 1 0:00 1:00 D
+Rule ROK 1948 only - Sep 13 0:00 0 S
+Rule ROK 1949 only - Apr 3 0:00 1:00 D
+Rule ROK 1949 1951 - Sep Sun>=8 0:00 0 S
+Rule ROK 1950 only - Apr 1 0:00 1:00 D
+Rule ROK 1951 only - May 6 0:00 1:00 D
+Rule ROK 1955 only - May 5 0:00 1:00 D
+Rule ROK 1955 only - Sep 9 0:00 0 S
+Rule ROK 1956 only - May 20 0:00 1:00 D
+Rule ROK 1956 only - Sep 30 0:00 0 S
+Rule ROK 1957 1960 - May Sun>=1 0:00 1:00 D
+Rule ROK 1957 1960 - Sep Sun>=18 0:00 0 S
+Rule ROK 1987 1988 - May Sun>=8 2:00 1:00 D
+Rule ROK 1987 1988 - Oct Sun>=8 3:00 0 S
-# From Paul Eggert (2014-07-01):
-# The following entries are from Shanks & Pottenger, except that I
-# guessed that time zone abbreviations through 1945 followed the same
+# From Paul Eggert (2014-10-30):
+# The Korean Wikipedia entry gives the following sources for UT offsets:
+#
+# 1908: Official Journal Article No. 3994 (Edict No. 5)
+# 1912: Governor-General of Korea Official Gazette Issue No. 367
+# (Announcement No. 338)
+# 1954: Presidential Decree No. 876 (1954-03-17)
+# 1961: Law No. 676 (1961-08-07)
+# 1987: Law No. 3919 (1986-12-31)
+#
+# The Wikipedia entry also has confusing information about a change
+# to UT+9 in April 1910, but then what would be the point of the later change
+# to UT+9 on 1912-01-01? Omit the 1910 change for now.
+#
+# I guessed that time zone abbreviations through 1945 followed the same
# rules as discussed under Taiwan, with nominal switches from JST to KST
# when the respective cities were taken over by the Allies after WWII.
+#
+# For Pyongyang we have no information; guess no changes since World War II.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Seoul 8:27:52 - LMT 1890
- 8:30 - KST 1904 Dec
- 9:00 - JCST 1928
- 8:30 - KST 1932
+Zone Asia/Seoul 8:27:52 - LMT 1908 Apr 1
+ 8:30 - KST 1912 Jan 1
9:00 - JCST 1937 Oct 1
9:00 - JST 1945 Sep 8
9:00 - KST 1954 Mar 21
- 8:00 ROK K%sT 1961 Aug 10
- 8:30 - KST 1968 Oct
+ 8:30 ROK K%sT 1961 Aug 10
9:00 ROK K%sT
-Zone Asia/Pyongyang 8:23:00 - LMT 1890
- 8:30 - KST 1904 Dec
- 9:00 - JCST 1928
- 8:30 - KST 1932
+Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1
+ 8:30 - KST 1912 Jan 1
9:00 - JCST 1937 Oct 1
9:00 - JST 1945 Aug 24
- 9:00 - KST 1954 Mar 21
- 8:00 - KST 1961 Aug 10
9:00 - KST
###############################################################################
--- a/jdk/make/data/tzdata/australasia Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/data/tzdata/australasia Fri Nov 21 14:58:29 2014 -0800
@@ -820,19 +820,19 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2013-02-21):
-# A good source for time zone historical data outside the U.S. is
+# From Paul Eggert (2014-10-31):
+#
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# Another source occasionally used is Edward W. Whitman, World Time Differences,
# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
--- a/jdk/make/data/tzdata/europe Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/data/tzdata/europe Fri Nov 21 14:58:29 2014 -0800
@@ -29,16 +29,19 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2014-05-31):
-# A good source for time zone historical data outside the U.S. is
+# From Paul Eggert (2014-10-31):
+#
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
@@ -310,6 +313,14 @@
# "Timeball on the ballast office is down. Dunsink time."
# -- James Joyce, Ulysses
+# "Countess Markievicz ... claimed that the [1916] abolition of Dublin Mean Time
+# was among various actions undertaken by the 'English' government that
+# would 'put the whole country into the SF (Sinn Féin) camp'. She claimed
+# Irish 'public feeling (was) outraged by forcing of English time on us'."
+# -- Parsons M. Dublin lost its time zone - and 25 minutes - after 1916 Rising.
+# Irish Times 2014-10-27.
+# http://www.irishtimes.com/news/politics/dublin-lost-its-time-zone-and-25-minutes-after-1916-rising-1.1977411
+
# From Joseph S. Myers (2005-01-26):
# Irish laws are available online at <http://www.irishstatutebook.ie>.
# These include various relating to legal time, for example:
@@ -617,6 +628,7 @@
Rule Russia 1993 2010 - Mar lastSun 2:00s 1:00 S
Rule Russia 1993 1995 - Sep lastSun 2:00s 0 -
Rule Russia 1996 2010 - Oct lastSun 2:00s 0 -
+# As described below, Russia's 2014 change affects Zone data, not Rule data.
# From Alexander Krivenyshev (2011-06-14):
# According to Kremlin press service, Russian President Dmitry Medvedev
--- a/jdk/make/data/tzdata/leapseconds Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/data/tzdata/leapseconds Fri Nov 21 14:58:29 2014 -0800
@@ -33,8 +33,8 @@
# The NTP Timescale and Leap Seconds
# http://www.eecis.udel.edu/~mills/leap.html
-# The International Earth Rotation Service periodically uses leap seconds
-# to keep UTC to within 0.9 s of UT1
+# The International Earth Rotation and Reference Systems Service
+# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
# (which measures the true angular orientation of the earth in space); see
# Terry J Quinn, The BIPM and the accurate measure of time,
# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
--- a/jdk/make/data/tzdata/northamerica Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/data/tzdata/northamerica Fri Nov 21 14:58:29 2014 -0800
@@ -1014,19 +1014,19 @@
################################################################################
-# From Paul Eggert (2006-03-22):
-# A good source for time zone historical data outside the U.S. is
+# From Paul Eggert (2014-10-31):
+#
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# Other sources occasionally used include:
#
@@ -3154,13 +3154,17 @@
# From Paul Eggert (2014-08-19):
# The 2014-08-13 Cabinet meeting decided to stay on UTC-4 year-round. See:
# http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
-# Model this as a switch from EST/EDT to AST on 2014-11-02 at 02:00.
+# Model this as a switch from EST/EDT to AST ...
+# From Chris Walton (2014-11-04):
+# ... the TCI government appears to have delayed the switch to
+# "permanent daylight saving time" by one year....
+# http://tcweeklynews.com/time-change-to-go-ahead-this-november-p5437-127.htm
#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Grand_Turk -4:44:32 - LMT 1890
-5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST 1979
- -5:00 US E%sT 2014 Nov 2 2:00
+ -5:00 US E%sT 2015 Nov Sun>=1 2:00
-4:00 - AST
# British Virgin Is
--- a/jdk/make/data/tzdata/southamerica Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/data/tzdata/southamerica Fri Nov 21 14:58:29 2014 -0800
@@ -29,23 +29,23 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2006-03-22):
-# A good source for time zone historical data outside the U.S. is
+# From Paul Eggert (2014-10-31):
+#
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
-#
-# For data circa 1899, a common source is:
-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
+# http://www.jstor.org/stable/1774359
#
# Earlier editions of these tables used the North American style (e.g. ARST and
# ARDT for Argentine Standard and Daylight Time), but the following quote
--- a/jdk/make/gensrc/GensrcIcons.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/gensrc/GensrcIcons.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -29,9 +29,9 @@
GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/java.desktop/sun/awt/
ifdef OPENJDK
- X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)
+ X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
else
- X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)
+ X11_ICONS_PATH_PREFIX := $(JDK_TOPDIR)/src/closed/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
endif
GENSRC_AWT_ICONS_SRC += \
--- a/jdk/make/gensrc/GensrcX11Wrappers.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/gensrc/GensrcX11Wrappers.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -95,8 +95,8 @@
-I$(JDK_TOPDIR)/src/java.base/share/native/include \
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include \
-I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
- -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \
+ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
#
--- a/jdk/make/launcher/Launcher-jdk.runtime.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/launcher/Launcher-jdk.runtime.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -42,7 +42,7 @@
$(JDK_TOPDIR)/src/jdk.runtime/share/native/unpack200
UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.runtime/share/native/common-unpack \
-I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
- -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava
+ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava
ifeq ($(USE_EXTERNAL_LIBZ), true)
UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB
@@ -102,7 +102,7 @@
MAPFILE := $(UNPACK_MAPFILE),\
LDFLAGS := $(UNPACKEXE_ZIPOBJS), \
LDFLAGS_windows := $(CXXFLAGS_JDKEXE), \
- LDFLAGS_posix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
+ LDFLAGS_unix := $(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_linux := -lc, \
--- a/jdk/make/launcher/LauncherCommon.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/launcher/LauncherCommon.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -62,7 +62,7 @@
LAUNCHER_SRC := $(JDK_TOPDIR)/src/java.base/share/native/launcher
LAUNCHER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/launcher \
-I$(JDK_TOPDIR)/src/java.base/share/native/libjli \
- -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli \
+ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
-I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
#
GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc
@@ -71,10 +71,10 @@
# Until the shuffle is permanent, we can't add this in configure
CFLAGS_JDKEXE := $(filter-out %javavm/export, $(CFLAGS_JDKEXE))
CFLAGS_JDKEXE += -I$(JDK_TOPDIR)/src/java.base/share/native/include \
- -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/include
+ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/include
CXXFLAGS_JDKEXE := $(filter-out %javavm/export, $(CXXFLAGS_JDKEXE))
CXXFLAGS_JDKEXE += -I$(JDK_TOPDIR)/src/java.base/share/native/include \
- -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/include
+ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/include
JAVA_MANIFEST := $(JDK_TOPDIR)/src/java.base/windows/native/launcher/java.manifest
define SetupLauncher
@@ -82,7 +82,7 @@
# Parameter 1 is the name of the launcher (java, javac, jar...)
# Parameter 2 is extra CFLAGS
# Parameter 3 is extra LDFLAGS
- # Parameter 4 is extra LDFLAGS_SUFFIX_posix
+ # Parameter 4 is extra LDFLAGS_SUFFIX_unix
# Parameter 5 is extra LDFLAGS_SUFFIX_windows
# Parameter 6 is optional Windows JLI library (full path)
# Parameter 7 is optional Windows resource (RC) flags
@@ -187,7 +187,7 @@
$(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)$(SHARED_LIBRARY_SUFFIX)), \
MAPFILE := $$($1_MAPFILE), \
LDFLAGS_SUFFIX := $(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX), \
- LDFLAGS_SUFFIX_posix := $4, \
+ LDFLAGS_SUFFIX_unix := $4, \
LDFLAGS_SUFFIX_windows := $$($1_WINDOWS_JLI_LIB) \
$(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5, \
LDFLAGS_SUFFIX_linux := -L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
@@ -231,4 +231,3 @@
else
JAVA_RC_FLAGS += -i "$(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons"
endif
-
--- a/jdk/make/lib/Awt2dLibraries.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Awt2dLibraries.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -31,7 +31,7 @@
$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib
BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
$(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libmlib_image
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image
BUILD_LIBMLIB_LDLIBS :=
BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
@@ -144,9 +144,9 @@
################################################################################
LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
#
ifeq ($(OPENJDK_TARGET_OS), aix)
@@ -211,7 +211,7 @@
# Why does libawt need java.base headers?
LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
-I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
-I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \
@@ -298,15 +298,15 @@
ifndef BUILD_HEADLESS_ONLY
LIBAWT_XAWT_DIRS := \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt_xawt \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt \
$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \
$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/x11 \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/x11 \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
#
LIBAWT_XAWT_EXCLUDES := medialib
@@ -315,15 +315,15 @@
-I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
-I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/font \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
$(LIBJAVA_HEADER_FLAGS)
#
@@ -514,14 +514,14 @@
################################################################################
LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libfontmanager
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager
LIBFONTMANAGER_CFLAGS := \
$(addprefix -I, $(shell $(FIND) \
$(LIBFONTMANAGER_SRC) \
$(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
$(JDK_TOPDIR)/src/java.desktop/share/native/common \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common -type d)) \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \
-I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
$(LIBJAVA_HEADER_FLAGS) \
#
@@ -542,7 +542,7 @@
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
X11TextRenderer.c
LIBFONTMANAGER_OPTIMIZATION := HIGHEST
- LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/windows
+ LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows
else ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
X11TextRenderer.c \
@@ -606,12 +606,12 @@
################################################################################
ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
- LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/windows \
+ LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
+ LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d/windows \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \
-I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
-I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
@@ -655,12 +655,12 @@
ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt
else
- LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjawt
+ LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
endif
LIBJAWT_CFLAGS := \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
-I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/include \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
$(LIBJAVA_HEADER_FLAGS) \
#
@@ -724,9 +724,9 @@
ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/awt \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/opengl \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/java2d/x11 \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/x11 \
$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
#
@@ -739,11 +739,11 @@
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libawt/java2d \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
-I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/common/font \
- -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunwjdga/ \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
+ -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsunwjdga/ \
$(LIBJAVA_HEADER_FLAGS) \
#
@@ -817,7 +817,7 @@
endif
ifneq ($(OPENJDK_TARGET_OS), macosx)
- LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libsplashscreen
+ LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen
else
LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
endif
@@ -988,7 +988,7 @@
-I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
-I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
-I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
- -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
+ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN) \
--- a/jdk/make/lib/CoreLibraries.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/CoreLibraries.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -99,7 +99,7 @@
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libverify/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := -ljvm -lc, \
+ LDFLAGS_SUFFIX_unix := -ljvm -lc, \
LDFLAGS_SUFFIX_windows := jvm.lib, \
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
RC_FLAGS := $(RC_FLAGS) \
@@ -160,7 +160,7 @@
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := -ljvm -lverify, \
+ LDFLAGS_SUFFIX_unix := -ljvm -lverify, \
LDFLAGS_SUFFIX_solaris := -lsocket -lnsl -lscf $(LIBDL) $(BUILD_LIBFDLIBM) -lc, \
LDFLAGS_SUFFIX_linux := $(LIBDL) $(BUILD_LIBFDLIBM), \
LDFLAGS_SUFFIX_aix := $(LIBDL) $(BUILD_LIBFDLIBM) -lm,\
@@ -216,9 +216,9 @@
CFLAGS := $(CFLAGS_JDKLIB) \
$(ZLIB_CPPFLAGS) \
-I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
- -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjava \
+ -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-I$(JDK_OUTPUTDIR)/gensrc_headers/java.base, \
- CFLAGS_posix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
+ CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libzip/mapfile-vers, \
REORDER := $(BUILD_LIBZIP_REORDER), \
LDFLAGS := $(LDFLAGS_JDKLIB) \
@@ -247,7 +247,7 @@
##########################################################################################
BUILD_LIBJLI_SRC_DIRS := $(JDK_TOPDIR)/src/java.base/share/native/libjli \
- $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli
+ $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli
LIBJLI_CFLAGS := $(CFLAGS_JDKLIB)
@@ -291,7 +291,7 @@
# if the architecture specific ergo file exists then
# use it, else use the generic definitions from ergo.c
- ifneq ($(wildcard $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libjli/$(ERGO_ARCH_FILE)), )
+ ifneq ($(wildcard $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli/$(ERGO_ARCH_FILE)), )
BUILD_LIBJLI_FILES += $(ERGO_ARCH_FILE)
else # !ERGO_ARCH_FILE
LIBJLI_CFLAGS += -DUSE_GENERIC_ERGO
--- a/jdk/make/lib/Lib-java.instrument.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-java.instrument.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -28,7 +28,7 @@
################################################################################
LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/java.instrument/share/native/libinstrument \
- $(JDK_TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_API_DIR)/native/libinstrument \
+ $(JDK_TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_TYPE)/native/libinstrument \
#
LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
$(addprefix -I, $(LIBINSTRUMENT_SRC)) \
--- a/jdk/make/lib/Lib-java.management.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-java.management.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -31,7 +31,7 @@
################################################################################
BUILD_LIBMANAGEMENT_SRC += $(JDK_TOPDIR)/src/java.management/share/native/libmanagement \
- $(JDK_TOPDIR)/src/java.management/$(OPENJDK_TARGET_OS_API_DIR)/native/libmanagement
+ $(JDK_TOPDIR)/src/java.management/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement
BUILD_LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \
$(addprefix -I,$(BUILD_LIBMANAGEMENT_SRC)) \
-I$(JDK_OUTPUTDIR)/gensrc_headers/java.management \
--- a/jdk/make/lib/Lib-java.prefs.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-java.prefs.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -30,7 +30,7 @@
ifeq ($(OPENJDK_TARGET_OS), macosx)
LIBPREF_SRC_DIRS := $(JDK_TOPDIR)/src/java.prefs/macosx/native/libprefs
else
- LIBPREF_SRC_DIRS := $(JDK_TOPDIR)/src/java.prefs/$(OPENJDK_TARGET_OS_API_DIR)/native/libprefs
+ LIBPREF_SRC_DIRS := $(JDK_TOPDIR)/src/java.prefs/$(OPENJDK_TARGET_OS_TYPE)/native/libprefs
endif
$(eval $(call SetupNativeCompilation,BUILD_LIBPREFS, \
--- a/jdk/make/lib/Lib-java.security.jgss.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-java.security.jgss.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -29,7 +29,7 @@
ifneq ($(OPENJDK_TARGET_OS), windows)
LIBJ2GSS_SRC := $(JDK_TOPDIR)/src/java.security.jgss/share/native/libj2gss \
- $(JDK_TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_API_DIR)/native/libj2gss \
+ $(JDK_TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_TYPE)/native/libj2gss \
#
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS, \
@@ -58,7 +58,7 @@
BUILD_LIBKRB5_NAME :=
ifeq ($(OPENJDK_TARGET_OS), windows)
BUILD_LIBKRB5_NAME := w2k_lsa_auth
- BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_API_DIR)/native/libw2k_lsa_auth
+ BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_TYPE)/native/libw2k_lsa_auth
BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
--- a/jdk/make/lib/Lib-java.smartcardio.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-java.smartcardio.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -28,9 +28,9 @@
################################################################################
LIBJ2PCSC_SRC := $(JDK_TOPDIR)/src/java.smartcardio/share/native/libj2pcsc \
- $(JDK_TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_API_DIR)/native/libj2pcsc
+ $(JDK_TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc
LIBJ2PCSC_CPPFLAGS := $(addprefix -I,$(LIBJ2PCSC_SRC)) \
- -I$(JDK_TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_API_DIR)/native/libj2pcsc/MUSCLE \
+ -I$(JDK_TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc/MUSCLE \
-I$(JDK_OUTPUTDIR)/gensrc_headers/java.smartcardio
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \
@@ -38,13 +38,13 @@
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
SRC := $(LIBJ2PCSC_SRC), \
LANG := C, \
- CFLAGS_posix := -D__sun_jdk, \
+ CFLAGS_unix := -D__sun_jdk, \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) $(LIBJ2PCSC_CPPFLAGS), \
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pcsc/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := $(LIBDL), \
+ LDFLAGS_SUFFIX_unix := $(LIBDL), \
LDFLAGS_SUFFIX_windows := winscard.lib, \
LDFLAGS_SUFFIX_solaris := -lc, \
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
--- a/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-jdk.crypto.mscapi.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -29,7 +29,7 @@
ifeq ($(OPENJDK_TARGET_OS), windows)
- LIBSUNMSCAPI_SRC := $(JDK_TOPDIR)/src/jdk.crypto.mscapi/$(OPENJDK_TARGET_OS_API_DIR)/native/libsunmscapi
+ LIBSUNMSCAPI_SRC := $(JDK_TOPDIR)/src/jdk.crypto.mscapi/$(OPENJDK_TARGET_OS_TYPE)/native/libsunmscapi
$(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI, \
LIBRARY := sunmscapi, \
--- a/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-jdk.crypto.pkcs11.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -28,7 +28,7 @@
################################################################################
LIBJ2PKCS11_SRC := $(JDK_TOPDIR)/src/jdk.crypto.pkcs11/share/native/libj2pkcs11 \
- $(JDK_TOPDIR)/src/jdk.crypto.pkcs11/$(OPENJDK_TARGET_OS_API_DIR)/native/libj2pkcs11
+ $(JDK_TOPDIR)/src/jdk.crypto.pkcs11/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pkcs11
$(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \
LIBRARY := j2pkcs11, \
@@ -42,7 +42,7 @@
MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
- LDFLAGS_SUFFIX_posix := $(LIBDL), \
+ LDFLAGS_SUFFIX_unix := $(LIBDL), \
LDFLAGS_SUFFIX_solaris := -lc, \
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
RC_FLAGS := $(RC_FLAGS) \
--- a/jdk/make/lib/Lib-jdk.jdi.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-jdk.jdi.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -30,7 +30,7 @@
ifeq ($(OPENJDK_TARGET_OS), windows)
LIBDT_SHMEM_SRC := $(JDK_TOPDIR)/src/jdk.jdi/share/native/libdt_shmem \
- $(JDK_TOPDIR)/src/jdk.jdi/$(OPENJDK_TARGET_OS_API_DIR)/native/libdt_shmem \
+ $(JDK_TOPDIR)/src/jdk.jdi/$(OPENJDK_TARGET_OS_TYPE)/native/libdt_shmem \
#
LIBDT_SHMEM_CPPFLAGS := -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
$(addprefix -I, $(LIBDT_SHMEM_SRC)) \
--- a/jdk/make/lib/Lib-jdk.jdwp.agent.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-jdk.jdwp.agent.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -28,7 +28,7 @@
################################################################################
LIBDT_SOCKET_SRC := $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libdt_socket \
- $(JDK_TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_API_DIR)/native/libdt_socket
+ $(JDK_TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libdt_socket
LIBDT_SOCKET_CPPFLAGS := \
$(addprefix -I, $(LIBDT_SOCKET_SRC)) \
-I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
@@ -66,7 +66,7 @@
################################################################################
LIBJDWP_SRC := $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \
- $(JDK_TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_API_DIR)/native/libjdwp
+ $(JDK_TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libjdwp
LIBJDWP_CPPFLAGS := \
-I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
-I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include \
--- a/jdk/make/lib/Lib-jdk.runtime.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-jdk.runtime.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -45,7 +45,7 @@
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_windows := -map:$(JDK_OUTPUTDIR)/objs/unpack.map -debug \
jvm.lib $(WIN_JAVA_LIB), \
- LDFLAGS_SUFFIX_posix := -ljvm $(LIBCXX) -ljava -lc, \
+ LDFLAGS_SUFFIX_unix := -ljvm $(LIBCXX) -ljava -lc, \
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libunpack, \
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
RC_FLAGS := $(RC_FLAGS) \
@@ -61,7 +61,7 @@
################################################################################
LIBJSDT_SRC := $(JDK_TOPDIR)/src/jdk.runtime/share/native/libjsdt \
- $(JDK_TOPDIR)/src/jdk.runtime/$(OPENJDK_TARGET_OS_API_DIR)/native/libjsdt
+ $(JDK_TOPDIR)/src/jdk.runtime/$(OPENJDK_TARGET_OS_TYPE)/native/libjsdt
$(eval $(call SetupNativeCompilation,BUILD_LIBJSDT, \
LIBRARY := jsdt, \
--- a/jdk/make/lib/Lib-jdk.sctp.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-jdk.sctp.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -27,7 +27,7 @@
################################################################################
-ifeq ($(OPENJDK_TARGET_OS_API), posix)
+ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
ifeq (, $(filter $(OPENJDK_TARGET_OS), macosx aix))
@@ -40,11 +40,11 @@
$(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
LIBRARY := sctp, \
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/jdk.sctp/$(OPENJDK_TARGET_OS_API_DIR)/native/libsctp, \
+ SRC := $(JDK_TOPDIR)/src/jdk.sctp/$(OPENJDK_TARGET_OS_TYPE)/native/libsctp, \
LANG := C, \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) \
- -I $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libnio/ch \
+ -I $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
-I $(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \
$(addprefix -I, $(call FindSrcDirsForLib, java.base, net)) \
$(LIBJAVA_HEADER_FLAGS) \
@@ -55,7 +55,7 @@
LDFLAGS := $(LDFLAGS_JDKLIB) \
$(call SET_SHARED_LIBRARY_ORIGIN), \
LDFLAGS_SUFFIX_linux := -lpthread $(LIBDL) -ljava -ljvm, \
- LDFLAGS_SUFFIX_posix := -lnio -lnet, \
+ LDFLAGS_SUFFIX_unix := -lnio -lnet, \
LDFLAGS_SUFFIX_solaris := -lsocket -ljava -ljvm -lc, \
LDFLAGS_SUFFIX_macosx := -ljava -ljvm, \
OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/libsctp, \
--- a/jdk/make/lib/Lib-jdk.security.auth.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/Lib-jdk.security.auth.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -43,7 +43,7 @@
$(eval $(call SetupNativeCompilation,BUILD_LIBJAAS, \
LIBRARY := $(LIBJAAS_NAME), \
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
- SRC := $(JDK_TOPDIR)/src/jdk.security.auth/$(OPENJDK_TARGET_OS_API_DIR)/native/libjaas, \
+ SRC := $(JDK_TOPDIR)/src/jdk.security.auth/$(OPENJDK_TARGET_OS_TYPE)/native/libjaas, \
LANG := C, \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) -I$(JDK_OUTPUTDIR)/gensrc_headers/jdk.security.auth, \
--- a/jdk/make/lib/LibCommon.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/LibCommon.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -34,8 +34,8 @@
GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc
-# Put the libraries here. Different locations for different target apis.
-ifeq ($(OPENJDK_TARGET_OS_API), posix)
+# Put the libraries here. Different locations for different target OS types.
+ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
else
INSTALL_LIBRARIES_HERE := $(JDK_OUTPUTDIR)/bin
@@ -63,7 +63,7 @@
# Param 2 - library name
FindSrcDirsForLib = $(call uniq, $(wildcard \
$(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \
- $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_API_DIR)/native/lib$(strip $2) \
+ $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
$(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
################################################################################
--- a/jdk/make/lib/NetworkingLibraries.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/NetworkingLibraries.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -24,7 +24,7 @@
#
LIBNET_SRC_DIRS := $(JDK_TOPDIR)/src/java.base/share/native/libnet \
- $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libnet
+ $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnet
LIBNET_CFLAGS += -I$(JDK_OUTPUTDIR)/gensrc_headers/java.base \
$(LIBJAVA_HEADER_FLAGS)
@@ -77,4 +77,3 @@
$(BUILD_LIBNET): $(BUILD_LIBJAVA)
BASE_LIBRARIES += $(BUILD_LIBNET)
-
--- a/jdk/make/lib/NioLibraries.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/NioLibraries.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -25,10 +25,10 @@
BUILD_LIBNIO_SRC := \
$(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \
- $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libnio \
+ $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio \
$(sort $(wildcard \
- $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libnio/ch \
- $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/native/libnio/fs \
+ $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
+ $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/fs \
$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/ch \
$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/fs)) \
#
--- a/jdk/make/lib/SoundLibraries.gmk Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/lib/SoundLibraries.gmk Fri Nov 21 14:58:29 2014 -0800
@@ -25,7 +25,7 @@
LIBJSOUND_SRC_DIRS := \
$(JDK_TOPDIR)/src/java.desktop/share/native/libjsound \
- $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/native/libjsound \
+ $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjsound \
#
LIBJSOUND_CFLAGS := \
-I$(JDK_OUTPUTDIR)/gensrc_headers/java.desktop \
@@ -169,7 +169,7 @@
-framework CoreServices -framework AudioUnit $(LIBCXX) \
-framework CoreMIDI -framework AudioToolbox, \
LDFLAGS_windows := $(WIN_JAVA_LIB) advapi32.lib winmm.lib, \
- LDFLAGS_SUFFIX_posix := -ljava -ljvm, \
+ LDFLAGS_SUFFIX_unix := -ljava -ljvm, \
LDFLAGS_SUFFIX_solaris := -lc, \
VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
RC_FLAGS := $(RC_FLAGS) \
--- a/jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/make/src/classes/build/tools/tzdb/TzdbZoneRulesProvider.java Fri Nov 21 14:58:29 2014 -0800
@@ -95,7 +95,17 @@
obj = zones.get(zoneId);
}
if (obj == null) {
- throw new ZoneRulesException("Unknown time-zone ID: " + zoneId0);
+ // Timezone link can be located in 'backward' file and it
+ // can refer to another link, so we need to check for
+ // link one more time, before throwing an exception
+ String zoneIdBack = zoneId;
+ if (links.containsKey(zoneId)) {
+ zoneId = links.get(zoneId);
+ obj = zones.get(zoneId);
+ }
+ if (obj == null) {
+ throw new ZoneRulesException("Unknown time-zone ID: " + zoneIdBack);
+ }
}
}
if (obj instanceof ZoneRules) {
--- a/jdk/src/java.base/share/classes/java/lang/Class.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/java/lang/Class.java Fri Nov 21 14:58:29 2014 -0800
@@ -719,15 +719,15 @@
/**
- * Returns the {@code Class} representing the superclass of the entity
- * (class, interface, primitive type or void) represented by this
- * {@code Class}. If this {@code Class} represents either the
+ * Returns the {@code Class} representing the direct superclass of the
+ * entity (class, interface, primitive type or void) represented by
+ * this {@code Class}. If this {@code Class} represents either the
* {@code Object} class, an interface, a primitive type, or void, then
* null is returned. If this object represents an array class then the
* {@code Class} object representing the {@code Object} class is
* returned.
*
- * @return the superclass of the class represented by this object.
+ * @return the direct superclass of the class represented by this object
*/
public native Class<? super T> getSuperclass();
@@ -758,7 +758,7 @@
* @throws java.lang.reflect.MalformedParameterizedTypeException if the
* generic superclass refers to a parameterized type that cannot be
* instantiated for any reason
- * @return the superclass of the class represented by this object
+ * @return the direct superclass of the class represented by this object
* @since 1.5
*/
public Type getGenericSuperclass() {
@@ -798,15 +798,15 @@
/**
- * Determines the interfaces implemented by the class or interface
+ * Returns the interfaces directly implemented by the class or interface
* represented by this object.
*
- * <p> If this object represents a class, the return value is an array
- * containing objects representing all interfaces implemented by the
- * class. The order of the interface objects in the array corresponds to
- * the order of the interface names in the {@code implements} clause
- * of the declaration of the class represented by this object. For
- * example, given the declaration:
+ * <p>If this object represents a class, the return value is an array
+ * containing objects representing all interfaces directly implemented by
+ * the class. The order of the interface objects in the array corresponds
+ * to the order of the interface names in the {@code implements} clause of
+ * the declaration of the class represented by this object. For example,
+ * given the declaration:
* <blockquote>
* {@code class Shimmer implements FloorWax, DessertTopping { ... }}
* </blockquote>
@@ -823,23 +823,23 @@
* is the {@code Class} object that represents interface
* {@code DessertTopping}.
*
- * <p> If this object represents an interface, the array contains objects
- * representing all interfaces extended by the interface. The order of the
- * interface objects in the array corresponds to the order of the interface
- * names in the {@code extends} clause of the declaration of the
- * interface represented by this object.
+ * <p>If this object represents an interface, the array contains objects
+ * representing all interfaces directly extended by the interface. The
+ * order of the interface objects in the array corresponds to the order of
+ * the interface names in the {@code extends} clause of the declaration of
+ * the interface represented by this object.
*
- * <p> If this object represents a class or interface that implements no
+ * <p>If this object represents a class or interface that implements no
* interfaces, the method returns an array of length 0.
*
- * <p> If this object represents a primitive type or void, the method
+ * <p>If this object represents a primitive type or void, the method
* returns an array of length 0.
*
- * <p> If this {@code Class} object represents an array type, the
+ * <p>If this {@code Class} object represents an array type, the
* interfaces {@code Cloneable} and {@code java.io.Serializable} are
* returned in that order.
*
- * @return an array of interfaces implemented by this class.
+ * @return an array of interfaces directly implemented by this class
*/
public Class<?>[] getInterfaces() {
ReflectionData<T> rd = reflectionData();
@@ -873,28 +873,27 @@
* for the semantics of the creation process for parameterized
* types.
*
- * <p> If this object represents a class, the return value is an
- * array containing objects representing all interfaces
- * implemented by the class. The order of the interface objects in
- * the array corresponds to the order of the interface names in
- * the {@code implements} clause of the declaration of the class
- * represented by this object. In the case of an array class, the
- * interfaces {@code Cloneable} and {@code Serializable} are
- * returned in that order.
+ * <p>If this object represents a class, the return value is an array
+ * containing objects representing all interfaces directly implemented by
+ * the class. The order of the interface objects in the array corresponds
+ * to the order of the interface names in the {@code implements} clause of
+ * the declaration of the class represented by this object.
*
- * <p>If this object represents an interface, the array contains
- * objects representing all interfaces directly extended by the
- * interface. The order of the interface objects in the array
- * corresponds to the order of the interface names in the
- * {@code extends} clause of the declaration of the interface
- * represented by this object.
+ * <p>If this object represents an interface, the array contains objects
+ * representing all interfaces directly extended by the interface. The
+ * order of the interface objects in the array corresponds to the order of
+ * the interface names in the {@code extends} clause of the declaration of
+ * the interface represented by this object.
*
- * <p>If this object represents a class or interface that
- * implements no interfaces, the method returns an array of length
- * 0.
+ * <p>If this object represents a class or interface that implements no
+ * interfaces, the method returns an array of length 0.
*
- * <p>If this object represents a primitive type or void, the
- * method returns an array of length 0.
+ * <p>If this object represents a primitive type or void, the method
+ * returns an array of length 0.
+ *
+ * <p>If this {@code Class} object represents an array type, the
+ * interfaces {@code Cloneable} and {@code java.io.Serializable} are
+ * returned in that order.
*
* @throws java.lang.reflect.GenericSignatureFormatError
* if the generic class signature does not conform to the format
@@ -905,7 +904,7 @@
* @throws java.lang.reflect.MalformedParameterizedTypeException
* if any of the generic superinterfaces refer to a parameterized
* type that cannot be instantiated for any reason
- * @return an array of interfaces implemented by this class
+ * @return an array of interfaces directly implemented by this class
* @since 1.5
*/
public Type[] getGenericInterfaces() {
@@ -1533,7 +1532,8 @@
* 0.
*
* <p> If this {@code Class} object represents a class, then this method
- * returns the public fields of the class and of all its superclasses.
+ * returns the public fields of the class and of all its superclasses and
+ * superinterfaces.
*
* <p> If this {@code Class} object represents an interface, then this
* method returns the fields of the interface and of all its
--- a/jdk/src/java.base/share/classes/java/lang/Object.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/java/lang/Object.java Fri Nov 21 14:58:29 2014 -0800
@@ -453,7 +453,7 @@
"nanosecond timeout value out of range");
}
- if (nanos >= 500000 || (nanos != 0 && timeout == 0)) {
+ if (nanos > 0) {
timeout++;
}
--- a/jdk/src/java.base/share/classes/java/net/Authenticator.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/java/net/Authenticator.java Fri Nov 21 14:58:29 2014 -0800
@@ -60,7 +60,7 @@
class Authenticator {
// The system-wide authenticator object. See setDefault().
- private static Authenticator theAuthenticator;
+ private static volatile Authenticator theAuthenticator;
private String requestingHost;
private InetAddress requestingSite;
--- a/jdk/src/java.base/share/classes/java/net/DatagramSocket.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/java/net/DatagramSocket.java Fri Nov 21 14:58:29 2014 -0800
@@ -771,6 +771,7 @@
} // end of while
}
}
+ DatagramPacket tmp = null;
if ((connectState == ST_CONNECTED_NO_IMPL) || explicitFilter) {
// We have to do the filtering the old fashioned way since
// the native impl doesn't support connect or the connect
@@ -795,11 +796,13 @@
if ((!connectedAddress.equals(peekAddress)) ||
(connectedPort != peekPort)) {
// throw the packet away and silently continue
- DatagramPacket tmp = new DatagramPacket(
+ tmp = new DatagramPacket(
new byte[1024], 1024);
getImpl().receive(tmp);
if (explicitFilter) {
- bytesLeftToFilter -= tmp.getLength();
+ if (checkFiltering(tmp)) {
+ stop = true;
+ }
}
} else {
stop = true;
@@ -809,18 +812,22 @@
// If the security check succeeds, or the datagram is
// connected then receive the packet
getImpl().receive(p);
- if (explicitFilter) {
- bytesLeftToFilter -= p.getLength();
- if (bytesLeftToFilter <= 0) {
- explicitFilter = false;
- } else {
- // break out of filter, if there is no more data queued
- explicitFilter = getImpl().dataAvailable() > 0;
- }
+ if (explicitFilter && tmp == null) {
+ // packet was not filtered, account for it here
+ checkFiltering(p);
}
}
}
+ private boolean checkFiltering(DatagramPacket p) throws SocketException {
+ bytesLeftToFilter -= p.getLength();
+ if (bytesLeftToFilter <= 0 || getImpl().dataAvailable() <= 0) {
+ explicitFilter = false;
+ return true;
+ }
+ return false;
+ }
+
/**
* Gets the local address to which the socket is bound.
*
--- a/jdk/src/java.base/share/classes/java/util/Formatter.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/java/util/Formatter.java Fri Nov 21 14:58:29 2014 -0800
@@ -2624,10 +2624,11 @@
private boolean dt = false;
private char c;
- private int index(String s) {
- if (s != null) {
+ private int index(String s, int start, int end) {
+ if (start >= 0) {
try {
- index = Integer.parseInt(s.substring(0, s.length() - 1));
+ // skip the trailing '$'
+ index = Integer.parseInt(s, start, end - 1, 10);
} catch (NumberFormatException x) {
assert(false);
}
@@ -2648,11 +2649,11 @@
return f;
}
- private int width(String s) {
+ private int width(String s, int start, int end) {
width = -1;
- if (s != null) {
+ if (start >= 0) {
try {
- width = Integer.parseInt(s);
+ width = Integer.parseInt(s, start, end, 10);
if (width < 0)
throw new IllegalFormatWidthException(width);
} catch (NumberFormatException x) {
@@ -2662,12 +2663,12 @@
return width;
}
- private int precision(String s) {
+ private int precision(String s, int start, int end) {
precision = -1;
- if (s != null) {
+ if (start >= 0) {
try {
- // remove the '.'
- precision = Integer.parseInt(s.substring(1));
+ // skip the leading '.'
+ precision = Integer.parseInt(s, start + 1, end, 10);
if (precision < 0)
throw new IllegalFormatPrecisionException(precision);
} catch (NumberFormatException x) {
@@ -2695,23 +2696,19 @@
}
FormatSpecifier(String s, Matcher m) {
- int idx = 1;
-
- index(m.group(idx++));
- flags(s, m.start(idx), m.end(idx++));
- width(m.group(idx++));
- precision(m.group(idx++));
-
- int tTStart = m.start(idx);
- int tTEnd = m.end(idx++);
- if (tTStart != -1 && tTEnd != -1) {
+ index(s, m.start(1), m.end(1));
+ flags(s, m.start(2), m.end(2));
+ width(s, m.start(3), m.end(3));
+ precision(s, m.start(4), m.end(4));
+
+ int tTStart = m.start(5);
+ if (tTStart >= 0) {
dt = true;
- if (tTStart == tTEnd - 1 && s.charAt(tTStart) == 'T') {
+ if (s.charAt(tTStart) == 'T') {
f.add(Flags.UPPERCASE);
}
}
-
- conversion(s.charAt(m.start(idx)));
+ conversion(s.charAt(m.start(6)));
if (dt)
checkDateTime();
--- a/jdk/src/java.base/share/classes/java/util/jar/Attributes.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/java/util/jar/Attributes.java Fri Nov 21 14:58:29 2014 -0800
@@ -28,7 +28,7 @@
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.Collection;
@@ -47,6 +47,9 @@
* <a href="../../../../technotes/guides/jar/jar.html">JAR File Specification</a>
* for more information about valid attribute names and values.
*
+ * <p>This map and its views have a predictable iteration order, namely the
+ * order that keys were inserted into the map, as with {@link LinkedHashMap}.
+ *
* @author David Connelly
* @see Manifest
* @since 1.2
@@ -71,7 +74,7 @@
* @param size the initial number of attributes
*/
public Attributes(int size) {
- map = new HashMap<>(size);
+ map = new LinkedHashMap<>(size);
}
/**
@@ -81,7 +84,7 @@
* @param attr the specified Attributes
*/
public Attributes(Attributes attr) {
- map = new HashMap<>(attr);
+ map = new LinkedHashMap<>(attr);
}
--- a/jdk/src/java.base/share/classes/java/util/zip/Adler32.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/java/util/zip/Adler32.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,8 @@
* can be computed much faster.
*
* <p> Passing a {@code null} argument to a method in this class will cause
- * a {@link NullPointerException} to be thrown.
+ * a {@link NullPointerException} to be thrown.</p>
*
- * @see Checksum
* @author David Connelly
*/
public
@@ -53,9 +52,8 @@
/**
* Updates the checksum with the specified byte (the low eight
* bits of the argument b).
- *
- * @param b the byte to update the checksum with
*/
+ @Override
public void update(int b) {
adler = update(adler, b);
}
@@ -63,11 +61,12 @@
/**
* Updates the checksum with the specified array of bytes.
*
- * @throws ArrayIndexOutOfBoundsException
- * if {@code off} is negative, or {@code len} is negative,
- * or {@code off+len} is greater than the length of the
- * array {@code b}
+ * @throws ArrayIndexOutOfBoundsException
+ * if {@code off} is negative, or {@code len} is negative, or
+ * {@code off+len} is negative or greater than the length of
+ * the array {@code b}.
*/
+ @Override
public void update(byte[] b, int off, int len) {
if (b == null) {
throw new NullPointerException();
@@ -79,28 +78,15 @@
}
/**
- * Updates the checksum with the specified array of bytes.
- *
- * @param b the byte array to update the checksum with
- */
- public void update(byte[] b) {
- adler = updateBytes(adler, b, 0, b.length);
- }
-
-
- /**
* Updates the checksum with the bytes from the specified buffer.
*
- * The checksum is updated using
- * buffer.{@link java.nio.Buffer#remaining() remaining()}
- * bytes starting at
- * buffer.{@link java.nio.Buffer#position() position()}
- * Upon return, the buffer's position will be updated to its
- * limit; its limit will not have been changed.
+ * The checksum is updated with the remaining bytes in the buffer, starting
+ * at the buffer's position. Upon return, the buffer's position will be
+ * updated to its limit; its limit will not have been changed.
*
- * @param buffer the ByteBuffer to update the checksum with
* @since 1.8
*/
+ @Override
public void update(ByteBuffer buffer) {
int pos = buffer.position();
int limit = buffer.limit();
@@ -113,9 +99,12 @@
} else if (buffer.hasArray()) {
adler = updateBytes(adler, buffer.array(), pos + buffer.arrayOffset(), rem);
} else {
- byte[] b = new byte[rem];
- buffer.get(b);
- adler = updateBytes(adler, b, 0, b.length);
+ byte[] b = new byte[Math.min(buffer.remaining(), 4096)];
+ while (buffer.hasRemaining()) {
+ int length = Math.min(buffer.remaining(), b.length);
+ buffer.get(b, 0, length);
+ update(b, 0, length);
+ }
}
buffer.position(limit);
}
@@ -123,6 +112,7 @@
/**
* Resets the checksum to initial value.
*/
+ @Override
public void reset() {
adler = 1;
}
@@ -130,6 +120,7 @@
/**
* Returns the checksum value.
*/
+ @Override
public long getValue() {
return (long)adler & 0xffffffffL;
}
--- a/jdk/src/java.base/share/classes/java/util/zip/CRC32.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/java/util/zip/CRC32.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,9 +32,8 @@
* A class that can be used to compute the CRC-32 of a data stream.
*
* <p> Passing a {@code null} argument to a method in this class will cause
- * a {@link NullPointerException} to be thrown.
+ * a {@link NullPointerException} to be thrown.</p>
*
- * @see Checksum
* @author David Connelly
*/
public
@@ -51,9 +50,8 @@
/**
* Updates the CRC-32 checksum with the specified byte (the low
* eight bits of the argument b).
- *
- * @param b the byte to update the checksum with
*/
+ @Override
public void update(int b) {
crc = update(crc, b);
}
@@ -61,11 +59,12 @@
/**
* Updates the CRC-32 checksum with the specified array of bytes.
*
- * @throws ArrayIndexOutOfBoundsException
- * if {@code off} is negative, or {@code len} is negative,
- * or {@code off+len} is greater than the length of the
- * array {@code b}
+ * @throws ArrayIndexOutOfBoundsException
+ * if {@code off} is negative, or {@code len} is negative, or
+ * {@code off+len} is negative or greater than the length of
+ * the array {@code b}.
*/
+ @Override
public void update(byte[] b, int off, int len) {
if (b == null) {
throw new NullPointerException();
@@ -77,27 +76,15 @@
}
/**
- * Updates the CRC-32 checksum with the specified array of bytes.
+ * Updates the CRC-32 checksum with the bytes from the specified buffer.
*
- * @param b the array of bytes to update the checksum with
- */
- public void update(byte[] b) {
- crc = updateBytes(crc, b, 0, b.length);
- }
-
- /**
- * Updates the checksum with the bytes from the specified buffer.
+ * The checksum is updated with the remaining bytes in the buffer, starting
+ * at the buffer's position. Upon return, the buffer's position will be
+ * updated to its limit; its limit will not have been changed.
*
- * The checksum is updated using
- * buffer.{@link java.nio.Buffer#remaining() remaining()}
- * bytes starting at
- * buffer.{@link java.nio.Buffer#position() position()}
- * Upon return, the buffer's position will
- * be updated to its limit; its limit will not have been changed.
- *
- * @param buffer the ByteBuffer to update the checksum with
* @since 1.8
*/
+ @Override
public void update(ByteBuffer buffer) {
int pos = buffer.position();
int limit = buffer.limit();
@@ -110,9 +97,12 @@
} else if (buffer.hasArray()) {
crc = updateBytes(crc, buffer.array(), pos + buffer.arrayOffset(), rem);
} else {
- byte[] b = new byte[rem];
- buffer.get(b);
- crc = updateBytes(crc, b, 0, b.length);
+ byte[] b = new byte[Math.min(buffer.remaining(), 4096)];
+ while (buffer.hasRemaining()) {
+ int length = Math.min(buffer.remaining(), b.length);
+ buffer.get(b, 0, length);
+ update(b, 0, length);
+ }
}
buffer.position(limit);
}
@@ -120,6 +110,7 @@
/**
* Resets CRC-32 to initial value.
*/
+ @Override
public void reset() {
crc = 0;
}
@@ -127,6 +118,7 @@
/**
* Returns CRC-32 value.
*/
+ @Override
public long getValue() {
return (long)crc & 0xffffffffL;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/share/classes/java/util/zip/CRC32C.java Fri Nov 21 14:58:29 2014 -0800
@@ -0,0 +1,339 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package java.util.zip;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import sun.misc.Unsafe;
+import sun.nio.ch.DirectBuffer;
+
+/**
+ * A class that can be used to compute the CRC-32C of a data stream.
+ *
+ * <p>
+ * CRC-32C is defined in <a href="http://www.ietf.org/rfc/rfc3720.txt">RFC
+ * 3720</a>: Internet Small Computer Systems Interface (iSCSI).
+ * </p>
+ *
+ * <p>
+ * Passing a {@code null} argument to a method in this class will cause a
+ * {@link NullPointerException} to be thrown.
+ * </p>
+ *
+ * @since 1.9
+ */
+public final class CRC32C implements Checksum {
+
+ /*
+ * This CRC-32C implementation uses the 'slicing-by-8' algorithm described
+ * in the paper "A Systematic Approach to Building High Performance
+ * Software-Based CRC Generators" by Michael E. Kounavis and Frank L. Berry,
+ * Intel Research and Development
+ */
+
+ /**
+ * CRC-32C Polynomial
+ */
+ private static final int CRC32C_POLY = 0x1EDC6F41;
+ private static final int REVERSED_CRC32C_POLY = Integer.reverse(CRC32C_POLY);
+
+ private static final Unsafe UNSAFE = Unsafe.getUnsafe();
+
+ // Lookup tables
+ // Lookup table for single byte calculations
+ private static final int[] byteTable;
+ // Lookup tables for bulk operations in 'slicing-by-8' algorithm
+ private static final int[][] byteTables = new int[8][256];
+ private static final int[] byteTable0 = byteTables[0];
+ private static final int[] byteTable1 = byteTables[1];
+ private static final int[] byteTable2 = byteTables[2];
+ private static final int[] byteTable3 = byteTables[3];
+ private static final int[] byteTable4 = byteTables[4];
+ private static final int[] byteTable5 = byteTables[5];
+ private static final int[] byteTable6 = byteTables[6];
+ private static final int[] byteTable7 = byteTables[7];
+
+ static {
+ // Generate lookup tables
+ // High-order polynomial term stored in LSB of r.
+ for (int index = 0; index < byteTables[0].length; index++) {
+ int r = index;
+ for (int i = 0; i < Byte.SIZE; i++) {
+ if ((r & 1) != 0) {
+ r = (r >>> 1) ^ REVERSED_CRC32C_POLY;
+ } else {
+ r >>>= 1;
+ }
+ }
+ byteTables[0][index] = r;
+ }
+
+ for (int index = 0; index < byteTables[0].length; index++) {
+ int r = byteTables[0][index];
+
+ for (int k = 1; k < byteTables.length; k++) {
+ r = byteTables[0][r & 0xFF] ^ (r >>> 8);
+ byteTables[k][index] = r;
+ }
+ }
+
+ if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) {
+ byteTable = byteTables[0];
+ } else { // ByteOrder.BIG_ENDIAN
+ byteTable = new int[byteTable0.length];
+ System.arraycopy(byteTable0, 0, byteTable, 0, byteTable0.length);
+ for (int[] table : byteTables) {
+ for (int index = 0; index < table.length; index++) {
+ table[index] = Integer.reverseBytes(table[index]);
+ }
+ }
+ }
+ }
+
+ /**
+ * Calculated CRC-32C value
+ */
+ private int crc = 0xFFFFFFFF;
+
+ /**
+ * Creates a new CRC32C object.
+ */
+ public CRC32C() {
+ }
+
+ /**
+ * Updates the CRC-32C checksum with the specified byte (the low eight bits
+ * of the argument b).
+ */
+ @Override
+ public void update(int b) {
+ crc = (crc >>> 8) ^ byteTable[(crc ^ (b & 0xFF)) & 0xFF];
+ }
+
+ /**
+ * Updates the CRC-32C checksum with the specified array of bytes.
+ *
+ * @throws ArrayIndexOutOfBoundsException
+ * if {@code off} is negative, or {@code len} is negative, or
+ * {@code off+len} is negative or greater than the length of
+ * the array {@code b}.
+ */
+ @Override
+ public void update(byte[] b, int off, int len) {
+ if (b == null) {
+ throw new NullPointerException();
+ }
+ if (off < 0 || len < 0 || off > b.length - len) {
+ throw new ArrayIndexOutOfBoundsException();
+ }
+ crc = updateBytes(crc, b, off, (off + len));
+ }
+
+ /**
+ * Updates the CRC-32C checksum with the bytes from the specified buffer.
+ *
+ * The checksum is updated with the remaining bytes in the buffer, starting
+ * at the buffer's position. Upon return, the buffer's position will be
+ * updated to its limit; its limit will not have been changed.
+ */
+ @Override
+ public void update(ByteBuffer buffer) {
+ int pos = buffer.position();
+ int limit = buffer.limit();
+ assert (pos <= limit);
+ int rem = limit - pos;
+ if (rem <= 0) {
+ return;
+ }
+
+ if (buffer instanceof DirectBuffer) {
+ crc = updateDirectByteBuffer(crc, ((DirectBuffer) buffer).address(),
+ pos, limit);
+ } else if (buffer.hasArray()) {
+ crc = updateBytes(crc, buffer.array(), pos + buffer.arrayOffset(),
+ limit + buffer.arrayOffset());
+ } else {
+ byte[] b = new byte[Math.min(buffer.remaining(), 4096)];
+ while (buffer.hasRemaining()) {
+ int length = Math.min(buffer.remaining(), b.length);
+ buffer.get(b, 0, length);
+ update(b, 0, length);
+ }
+ }
+ buffer.position(limit);
+ }
+
+ /**
+ * Resets CRC-32C to initial value.
+ */
+ @Override
+ public void reset() {
+ crc = 0xFFFFFFFF;
+ }
+
+ /**
+ * Returns CRC-32C value.
+ */
+ @Override
+ public long getValue() {
+ return (~crc) & 0xFFFFFFFFL;
+ }
+
+ /**
+ * Updates the CRC-32C checksum with the specified array of bytes.
+ */
+ private static int updateBytes(int crc, byte[] b, int off, int end) {
+
+ // Do only byte reads for arrays so short they can't be aligned
+ // or if bytes are stored with a larger witdh than one byte.,%
+ if (end - off >= 8 && Unsafe.ARRAY_BYTE_INDEX_SCALE == 1) {
+
+ // align on 8 bytes
+ int alignLength
+ = (8 - ((Unsafe.ARRAY_BYTE_BASE_OFFSET + off) & 0x7)) & 0x7;
+ for (int alignEnd = off + alignLength; off < alignEnd; off++) {
+ crc = (crc >>> 8) ^ byteTable[(crc ^ b[off]) & 0xFF];
+ }
+
+ if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) {
+ crc = Integer.reverseBytes(crc);
+ }
+
+ // slicing-by-8
+ for (; off < (end - Long.BYTES); off += Long.BYTES) {
+ int firstHalf;
+ int secondHalf;
+ if (Unsafe.ADDRESS_SIZE == 4) {
+ // On 32 bit platforms read two ints instead of a single 64bit long
+ firstHalf = UNSAFE.getInt(b, Unsafe.ARRAY_BYTE_BASE_OFFSET + off);
+ secondHalf = UNSAFE.getInt(b, Unsafe.ARRAY_BYTE_BASE_OFFSET + off
+ + Integer.BYTES);
+ } else {
+ long value = UNSAFE.getLong(b, Unsafe.ARRAY_BYTE_BASE_OFFSET + off);
+ if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) {
+ firstHalf = (int) value;
+ secondHalf = (int) (value >>> 32);
+ } else { // ByteOrder.BIG_ENDIAN
+ firstHalf = (int) (value >>> 32);
+ secondHalf = (int) value;
+ }
+ }
+ crc ^= firstHalf;
+ if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) {
+ crc = byteTable7[crc & 0xFF]
+ ^ byteTable6[(crc >>> 8) & 0xFF]
+ ^ byteTable5[(crc >>> 16) & 0xFF]
+ ^ byteTable4[crc >>> 24]
+ ^ byteTable3[secondHalf & 0xFF]
+ ^ byteTable2[(secondHalf >>> 8) & 0xFF]
+ ^ byteTable1[(secondHalf >>> 16) & 0xFF]
+ ^ byteTable0[secondHalf >>> 24];
+ } else { // ByteOrder.BIG_ENDIAN
+ crc = byteTable0[secondHalf & 0xFF]
+ ^ byteTable1[(secondHalf >>> 8) & 0xFF]
+ ^ byteTable2[(secondHalf >>> 16) & 0xFF]
+ ^ byteTable3[secondHalf >>> 24]
+ ^ byteTable4[crc & 0xFF]
+ ^ byteTable5[(crc >>> 8) & 0xFF]
+ ^ byteTable6[(crc >>> 16) & 0xFF]
+ ^ byteTable7[crc >>> 24];
+ }
+ }
+
+ if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) {
+ crc = Integer.reverseBytes(crc);
+ }
+ }
+
+ // Tail
+ for (; off < end; off++) {
+ crc = (crc >>> 8) ^ byteTable[(crc ^ b[off]) & 0xFF];
+ }
+
+ return crc;
+ }
+
+ /**
+ * Updates the CRC-32C checksum reading from the specified address.
+ */
+ private static int updateDirectByteBuffer(int crc, long address,
+ int off, int end) {
+
+ // Do only byte reads for arrays so short they can't be aligned
+ if (end - off >= 8) {
+
+ // align on 8 bytes
+ int alignLength = (8 - (int) ((address + off) & 0x7)) & 0x7;
+ for (int alignEnd = off + alignLength; off < alignEnd; off++) {
+ crc = (crc >>> 8)
+ ^ byteTable[(crc ^ UNSAFE.getByte(address + off)) & 0xFF];
+ }
+
+ if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) {
+ crc = Integer.reverseBytes(crc);
+ }
+
+ // slicing-by-8
+ for (; off <= (end - Long.BYTES); off += Long.BYTES) {
+ // Always reading two ints as reading a long followed by
+ // shifting and casting was slower.
+ int firstHalf = UNSAFE.getInt(address + off);
+ int secondHalf = UNSAFE.getInt(address + off + Integer.BYTES);
+ crc ^= firstHalf;
+ if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) {
+ crc = byteTable7[crc & 0xFF]
+ ^ byteTable6[(crc >>> 8) & 0xFF]
+ ^ byteTable5[(crc >>> 16) & 0xFF]
+ ^ byteTable4[crc >>> 24]
+ ^ byteTable3[secondHalf & 0xFF]
+ ^ byteTable2[(secondHalf >>> 8) & 0xFF]
+ ^ byteTable1[(secondHalf >>> 16) & 0xFF]
+ ^ byteTable0[secondHalf >>> 24];
+ } else { // ByteOrder.BIG_ENDIAN
+ crc = byteTable0[secondHalf & 0xFF]
+ ^ byteTable1[(secondHalf >>> 8) & 0xFF]
+ ^ byteTable2[(secondHalf >>> 16) & 0xFF]
+ ^ byteTable3[secondHalf >>> 24]
+ ^ byteTable4[crc & 0xFF]
+ ^ byteTable5[(crc >>> 8) & 0xFF]
+ ^ byteTable6[(crc >>> 16) & 0xFF]
+ ^ byteTable7[crc >>> 24];
+ }
+ }
+
+ if (ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN) {
+ crc = Integer.reverseBytes(crc);
+ }
+ }
+
+ // Tail
+ for (; off < end; off++) {
+ crc = (crc >>> 8)
+ ^ byteTable[(crc ^ UNSAFE.getByte(address + off)) & 0xFF];
+ }
+
+ return crc;
+ }
+}
--- a/jdk/src/java.base/share/classes/java/util/zip/Checksum.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/java/util/zip/Checksum.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,16 +22,17 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
+package java.util.zip;
-package java.util.zip;
+import java.nio.ByteBuffer;
/**
* An interface representing a data checksum.
*
- * @author David Connelly
+ * @author David Connelly
*/
-public
-interface Checksum {
+public interface Checksum {
+
/**
* Updates the current checksum with the specified byte.
*
@@ -41,6 +42,24 @@
/**
* Updates the current checksum with the specified array of bytes.
+ *
+ * @implSpec This default implementation is equal to calling
+ * {@code update(b, 0, b.length)}.
+ *
+ * @param b the array of bytes to update the checksum with
+ *
+ * @throws NullPointerException
+ * if {@code b} is {@code null}
+ *
+ * @since 1.9
+ */
+ default public void update(byte[] b) {
+ update(b, 0, b.length);
+ }
+
+ /**
+ * Updates the current checksum with the specified array of bytes.
+ *
* @param b the byte array to update the checksum with
* @param off the start offset of the data
* @param len the number of bytes to use for the update
@@ -48,7 +67,64 @@
public void update(byte[] b, int off, int len);
/**
+ * Updates the current checksum with the bytes from the specified buffer.
+ *
+ * The checksum is updated with the remaining bytes in the buffer, starting
+ * at the buffer's position. Upon return, the buffer's position will be
+ * updated to its limit; its limit will not have been changed.
+ *
+ * @apiNote For best performance with DirectByteBuffer and other ByteBuffer
+ * implementations without a backing array implementers of this interface
+ * should override this method.
+ *
+ * @implSpec The default implementation has the following behavior.<br>
+ * For ByteBuffers backed by an accessible byte array.
+ * <pre>{@code
+ * update(buffer.array(),
+ * buffer.position() + buffer.arrayOffset(),
+ * buffer.remaining());
+ * }</pre>
+ * For ByteBuffers not backed by an accessible byte array.
+ * <pre>{@code
+ * byte[] b = new byte[Math.min(buffer.remaining(), 4096)];
+ * while (buffer.hasRemaining()) {
+ * int length = Math.min(buffer.remaining(), b.length);
+ * buffer.get(b, 0, length);
+ * update(b, 0, length);
+ * }
+ * }</pre>
+ *
+ * @param buffer the ByteBuffer to update the checksum with
+ *
+ * @throws NullPointerException
+ * if {@code buffer} is {@code null}
+ *
+ * @since 1.9
+ */
+ default public void update(ByteBuffer buffer) {
+ int pos = buffer.position();
+ int limit = buffer.limit();
+ assert (pos <= limit);
+ int rem = limit - pos;
+ if (rem <= 0) {
+ return;
+ }
+ if (buffer.hasArray()) {
+ update(buffer.array(), pos + buffer.arrayOffset(), rem);
+ } else {
+ byte[] b = new byte[Math.min(buffer.remaining(), 4096)];
+ while (buffer.hasRemaining()) {
+ int length = Math.min(buffer.remaining(), b.length);
+ buffer.get(b, 0, length);
+ update(b, 0, length);
+ }
+ }
+ buffer.position(limit);
+ }
+
+ /**
* Returns the current checksum value.
+ *
* @return the current checksum value
*/
public long getValue();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.base/share/classes/java/util/zip/package-info.java Fri Nov 21 14:58:29 2014 -0800
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Provides classes for reading and writing the standard ZIP and GZIP file
+ * formats. Also includes classes for compressing and decompressing data using
+ * the DEFLATE compression algorithm, which is used by the ZIP and GZIP file
+ * formats. Additionally, there are utility classes for computing the CRC-32,
+ * CRC-32C and Adler-32 checksums of arbitrary input streams.
+ *
+ * <h2>Package Specification</h2>
+ *
+ * <ul>
+ * <li><a href="http://www.info-zip.org/doc/appnote-19970311-iz.zip">
+ * Info-ZIP Application Note 970311</a> - a detailed description of
+ * the Info-ZIP format upon which the {@code java.util.zip} classes
+ * are based.
+ * <li><a name="zip64">An implementation may optionally support the
+ * ZIP64(tm) format extensions defined by the</a>
+ * <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">
+ * PKWARE ZIP File Format Specification</a>. The ZIP64(tm) format
+ * extensions are used to overcome the size limitations of the
+ * original ZIP format.
+ * <li><a name="lang_encoding">APPENDIX D of</a>
+ * <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">
+ * PKWARE ZIP File Format Specification</a> - Language Encoding Flag
+ * (EFS) to encode ZIP entry filename and comment fields using UTF-8.
+ * <li><a href="http://www.ietf.org/rfc/rfc1950.txt">
+ * ZLIB Compressed Data Format Specification version 3.3</a>
+ *
+ * <a href="http://www.ietf.org/rfc/rfc1950.txt.pdf">(pdf)</a>
+ * (RFC 1950)
+ * <li><a href="http://www.ietf.org/rfc/rfc1951.txt">
+ * DEFLATE Compressed Data Format Specification version 1.3</a>
+ *
+ * <a href="http://www.ietf.org/rfc/rfc1951.txt.pdf">(pdf)</a>
+ * (RFC 1951)
+ * <li><a href="http://www.ietf.org/rfc/rfc1952.txt">
+ * GZIP file format specification version 4.3</a>
+ *
+ * <a href="http://www.ietf.org/rfc/rfc1952.txt.pdf">(pdf)</a>
+ * (RFC 1952)
+ * <li>CRC-32 checksum is described in RFC 1952 (above)
+ * <li>CRC-32C checksum is described in
+ * <a href="http://www.ietf.org/rfc/rfc3720.txt">Internet Small
+ * Computer Systems Interface (iSCSI)</a>
+ *
+ * <a href="http://www.ietf.org/rfc/rfc3720.txt.pdf">(pdf)</a>
+ * (RFC 3720)
+ * <li>Adler-32 checksum is described in RFC 1950 (above)
+ * </ul>
+ *
+ * @since 1.1
+ */
+package java.util.zip;
--- a/jdk/src/java.base/share/classes/java/util/zip/package.html Thu Nov 13 15:45:45 2014 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
-Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
-DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-
-This code is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License version 2 only, as
-published by the Free Software Foundation. Oracle designates this
-particular file as subject to the "Classpath" exception as provided
-by Oracle in the LICENSE file that accompanied this code.
-
-This code is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-version 2 for more details (a copy is included in the LICENSE file that
-accompanied this code).
-
-You should have received a copy of the GNU General Public License version
-2 along with this work; if not, write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-or visit www.oracle.com if you need additional information or have any
-questions.
--->
-
-</head>
-<body bgcolor="white">
-
-Provides classes for reading and writing the standard ZIP and GZIP
-file formats. Also includes classes for compressing and decompressing
-data using the DEFLATE compression algorithm, which is used by the
-ZIP and GZIP file formats. Additionally, there are utility classes
-for computing the CRC-32 and Adler-32 checksums of arbitrary
-input streams.
-
-
-<h2>Package Specification</h2>
-
-<ul>
- <li><a href="http://www.info-zip.org/doc/appnote-19970311-iz.zip">
- Info-ZIP Application Note 970311
- </a> - a detailed description of the Info-ZIP format upon which
- the <code>java.util.zip</code> classes are based.
- <li><a name="zip64">An implementation may optionally support the ZIP64(tm) format extensions
- defined by the </a>
- <a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">
- PKWARE ZIP File Format Specification</a>. The ZIP64(tm) format extensions
- are used to overcome the size limitations of the original ZIP format.
- <li><a name="lang_encoding">APPENDIX D of </a><a href="http://www.pkware.com/documents/casestudies/APPNOTE.TXT">
- PKWARE ZIP File Format Specification</a> - Language Encoding Flag (EFS) to
- encode ZIP entry filename and comment fields using UTF-8.
- <li><a href="http://www.ietf.org/rfc/rfc1950.txt">
- ZLIB Compressed Data Format Specification version 3.3</a>
-
- <a href="http://www.ietf.org/rfc/rfc1950.txt.pdf">(pdf)</a>
- (RFC 1950)
- <li><a href="http://www.ietf.org/rfc/rfc1951.txt">
- DEFLATE Compressed Data Format Specification version 1.3</a>
-
- <a href="http://www.ietf.org/rfc/rfc1951.txt.pdf">(pdf)</a>
- (RFC 1951)
- <li><a href="http://www.ietf.org/rfc/rfc1952.txt">
- GZIP file format specification version 4.3</a>
-
- <a href="http://www.ietf.org/rfc/rfc1952.txt.pdf">(pdf)</a>
- (RFC 1952)
- <li>CRC-32 checksum is described in RFC 1952 (above)
- <li>Adler-32 checksum is described in RFC 1950 (above)
-</ul>
-
-
-<!--
-<h2>Related Documentation</h2>
-
-For overviews, tutorials, examples, guides, and tool documentation, please see:
-<ul>
- <li><a href="">##### REFER TO NON-SPEC DOCUMENTATION HERE #####</a>
-</ul>
--->
-
-@since 1.1
-</body>
-</html>
-
-
--- a/jdk/src/java.base/share/classes/javax/crypto/CipherInputStream.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/javax/crypto/CipherInputStream.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -88,6 +88,8 @@
private int ofinish = 0;
// stream status
private boolean closed = false;
+ // The stream has been read from. False if the stream has never been read.
+ private boolean read = false;
/**
* private convenience function.
@@ -103,6 +105,7 @@
private int getMoreData() throws IOException {
if (done) return -1;
int readin = input.read(ibuffer);
+ read = true;
if (readin == -1) {
done = true;
try {
@@ -306,7 +309,11 @@
}
}
catch (BadPaddingException | IllegalBlockSizeException ex) {
- throw new IOException(ex);
+ /* If no data has been read from the stream to be en/decrypted,
+ we supress any exceptions, and close quietly. */
+ if (read) {
+ throw new IOException(ex);
+ }
}
ostart = 0;
ofinish = 0;
--- a/jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/sun/net/www/http/HttpClient.java Fri Nov 21 14:58:29 2014 -0800
@@ -657,9 +657,10 @@
cachedHttpClient = false;
if (!failedOnce && requests != null) {
failedOnce = true;
- if (getRequestMethod().equals("CONNECT") ||
- (httpuc.getRequestMethod().equals("POST") &&
- (!retryPostProp || streaming))) {
+ if (getRequestMethod().equals("CONNECT")
+ || streaming
+ || (httpuc.getRequestMethod().equals("POST")
+ && !retryPostProp)) {
// do not retry the request
} else {
// try once more
@@ -769,9 +770,10 @@
} else if (nread != 8) {
if (!failedOnce && requests != null) {
failedOnce = true;
- if (getRequestMethod().equals("CONNECT") ||
- (httpuc.getRequestMethod().equals("POST") &&
- (!retryPostProp || streaming))) {
+ if (getRequestMethod().equals("CONNECT")
+ || streaming
+ || (httpuc.getRequestMethod().equals("POST")
+ && !retryPostProp)) {
// do not retry the request
} else {
closeServer();
--- a/jdk/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/sun/nio/ch/DatagramChannelImpl.java Fri Nov 21 14:58:29 2014 -0800
@@ -752,7 +752,7 @@
}
do {
tmpBuf.clear();
- } while (read(tmpBuf) > 0);
+ } while (receive(tmpBuf) != null);
} finally {
if (blocking) {
configureBlocking(true);
--- a/jdk/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java Fri Nov 21 14:58:29 2014 -0800
@@ -42,8 +42,11 @@
public static final ClassRepository NONE = ClassRepository.make("Ljava/lang/Object;", null);
- private Type superclass; // caches the generic superclass info
- private Type[] superInterfaces; // caches the generic superinterface info
+ /** The generic superclass info. Lazily initialized. */
+ private volatile Type superclass;
+
+ /** The generic superinterface info. Lazily initialized. */
+ private volatile Type[] superInterfaces;
// private, to enforce use of static factory
private ClassRepository(String rawSig, GenericsFactory f) {
@@ -79,31 +82,34 @@
* with which the repository was created.
*/
- public Type getSuperclass(){
+ public Type getSuperclass() {
+ Type superclass = this.superclass;
if (superclass == null) { // lazily initialize superclass
Reifier r = getReifier(); // obtain visitor
// Extract superclass subtree from AST and reify
getTree().getSuperclass().accept(r);
// extract result from visitor and cache it
superclass = r.getResult();
- }
+ this.superclass = superclass;
+ }
return superclass; // return cached result
}
- public Type[] getSuperInterfaces(){
+ public Type[] getSuperInterfaces() {
+ Type[] superInterfaces = this.superInterfaces;
if (superInterfaces == null) { // lazily initialize super interfaces
// first, extract super interface subtree(s) from AST
TypeTree[] ts = getTree().getSuperInterfaces();
// create array to store reified subtree(s)
- Type[] sis = new Type[ts.length];
+ superInterfaces = new Type[ts.length];
// reify all subtrees
for (int i = 0; i < ts.length; i++) {
Reifier r = getReifier(); // obtain visitor
ts[i].accept(r);// reify subtree
// extract result from visitor and store it
- sis[i] = r.getResult();
+ superInterfaces[i] = r.getResult();
}
- superInterfaces = sis; // cache overall result
+ this.superInterfaces = superInterfaces;
}
return superInterfaces.clone(); // return cached result
}
--- a/jdk/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java Fri Nov 21 14:58:29 2014 -0800
@@ -42,7 +42,8 @@
public abstract class GenericDeclRepository<S extends Signature>
extends AbstractRepository<S> {
- private TypeVariable<?>[] typeParams; // caches the formal type parameters
+ /** The formal type parameters. Lazily initialized. */
+ private volatile TypeVariable<?>[] typeParams;
protected GenericDeclRepository(String rawSig, GenericsFactory f) {
super(rawSig, f);
@@ -55,8 +56,7 @@
* If the corresponding field is non-null, it is returned.
* If not, it is created lazily. This is done by selecting the appropriate
* part of the tree and transforming it into a reflective object
- * using a visitor.
- * a visitor, which is created by feeding it the factory
+ * using a visitor, which is created by feeding it the factory
* with which the repository was created.
*/
@@ -64,20 +64,21 @@
* Return the formal type parameters of this generic declaration.
* @return the formal type parameters of this generic declaration
*/
- public TypeVariable<?>[] getTypeParameters(){
+ public TypeVariable<?>[] getTypeParameters() {
+ TypeVariable<?>[] typeParams = this.typeParams;
if (typeParams == null) { // lazily initialize type parameters
// first, extract type parameter subtree(s) from AST
FormalTypeParameter[] ftps = getTree().getFormalTypeParameters();
// create array to store reified subtree(s)
- TypeVariable<?>[] tps = new TypeVariable<?>[ftps.length];
+ typeParams = new TypeVariable<?>[ftps.length];
// reify all subtrees
for (int i = 0; i < ftps.length; i++) {
Reifier r = getReifier(); // obtain visitor
ftps[i].accept(r); // reify subtree
// extract result from visitor and store it
- tps[i] = (TypeVariable<?>) r.getResult();
+ typeParams[i] = (TypeVariable<?>) r.getResult();
}
- typeParams = tps; // cache overall result
+ this.typeParams = typeParams; // cache overall result
}
return typeParams.clone(); // return cached result
}
--- a/jdk/src/java.base/share/classes/sun/reflect/generics/scope/AbstractScope.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/sun/reflect/generics/scope/AbstractScope.java Fri Nov 21 14:58:29 2014 -0800
@@ -42,7 +42,9 @@
implements Scope {
private final D recvr; // the declaration whose scope this instance represents
- private Scope enclosingScope; // the enclosing scope of this scope
+
+ /** The enclosing scope of this scope. Lazily initialized. */
+ private volatile Scope enclosingScope;
/**
* Constructor. Takes a reflective object whose scope the newly
@@ -71,7 +73,11 @@
* @return the enclosing scope
*/
protected Scope getEnclosingScope(){
- if (enclosingScope == null) {enclosingScope = computeEnclosingScope();}
+ Scope enclosingScope = this.enclosingScope;
+ if (enclosingScope == null) {
+ enclosingScope = computeEnclosingScope();
+ this.enclosingScope = enclosingScope;
+ }
return enclosingScope;
}
--- a/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/CipherSuite.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -968,7 +968,7 @@
* 1. Prefer Suite B compliant cipher suites, see RFC6460 (To be
* changed later, see below).
* 2. Prefer the stronger bulk cipher, in the order of AES_256(GCM),
- * AES_128(GCM), AES_256, AES_128, RC-4, 3DES-EDE.
+ * AES_128(GCM), AES_256, AES_128, 3DES-EDE, RC-4.
* 3. Prefer the stronger MAC algorithm, in the order of SHA384,
* SHA256, SHA, MD5.
* 4. Prefer the better performance of key exchange and digital
@@ -1087,18 +1087,6 @@
add("TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
0x0032, --p, K_DHE_DSS, B_AES_128, T);
- // RC-4
- add("TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
- 0xC007, --p, K_ECDHE_ECDSA, B_RC4_128, N);
- add("TLS_ECDHE_RSA_WITH_RC4_128_SHA",
- 0xC011, --p, K_ECDHE_RSA, B_RC4_128, N);
- add("SSL_RSA_WITH_RC4_128_SHA",
- 0x0005, --p, K_RSA, B_RC4_128, N);
- add("TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
- 0xC002, --p, K_ECDH_ECDSA, B_RC4_128, N);
- add("TLS_ECDH_RSA_WITH_RC4_128_SHA",
- 0xC00C, --p, K_ECDH_RSA, B_RC4_128, N);
-
// 3DES_EDE
add("TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
0xC008, --p, K_ECDHE_ECDSA, B_3DES, T);
@@ -1115,6 +1103,17 @@
add("SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
0x0013, --p, K_DHE_DSS, B_3DES, N);
+ // RC-4
+ add("TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
+ 0xC007, --p, K_ECDHE_ECDSA, B_RC4_128, N);
+ add("TLS_ECDHE_RSA_WITH_RC4_128_SHA",
+ 0xC011, --p, K_ECDHE_RSA, B_RC4_128, N);
+ add("SSL_RSA_WITH_RC4_128_SHA",
+ 0x0005, --p, K_RSA, B_RC4_128, N);
+ add("TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
+ 0xC002, --p, K_ECDH_ECDSA, B_RC4_128, N);
+ add("TLS_ECDH_RSA_WITH_RC4_128_SHA",
+ 0xC00C, --p, K_ECDH_RSA, B_RC4_128, N);
add("SSL_RSA_WITH_RC4_128_MD5",
0x0004, --p, K_RSA, B_RC4_128, N);
@@ -1134,7 +1133,7 @@
* 2. If a cipher suite has been obsoleted, we put it at the end of
* the list.
* 3. Prefer the stronger bulk cipher, in the order of AES_256,
- * AES_128, RC-4, 3DES-EDE, DES, RC4_40, DES40, NULL.
+ * AES_128, 3DES-EDE, RC-4, DES, DES40, RC4_40, NULL.
* 4. Prefer the stronger MAC algorithm, in the order of SHA384,
* SHA256, SHA, MD5.
* 5. Prefer the better performance of key exchange and digital
@@ -1162,15 +1161,40 @@
add("TLS_DH_anon_WITH_AES_128_CBC_SHA",
0x0034, --p, K_DH_ANON, B_AES_128, N);
+ add("TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
+ 0xC017, --p, K_ECDH_ANON, B_3DES, N);
+ add("SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
+ 0x001b, --p, K_DH_ANON, B_3DES, N);
+
add("TLS_ECDH_anon_WITH_RC4_128_SHA",
0xC016, --p, K_ECDH_ANON, B_RC4_128, N);
add("SSL_DH_anon_WITH_RC4_128_MD5",
0x0018, --p, K_DH_ANON, B_RC4_128, N);
- add("TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
- 0xC017, --p, K_ECDH_ANON, B_3DES, N);
- add("SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
- 0x001b, --p, K_DH_ANON, B_3DES, N);
+ // weak cipher suites obsoleted in TLS 1.2
+ add("SSL_RSA_WITH_DES_CBC_SHA",
+ 0x0009, --p, K_RSA, B_DES, N, tls12);
+ add("SSL_DHE_RSA_WITH_DES_CBC_SHA",
+ 0x0015, --p, K_DHE_RSA, B_DES, N, tls12);
+ add("SSL_DHE_DSS_WITH_DES_CBC_SHA",
+ 0x0012, --p, K_DHE_DSS, B_DES, N, tls12);
+ add("SSL_DH_anon_WITH_DES_CBC_SHA",
+ 0x001a, --p, K_DH_ANON, B_DES, N, tls12);
+
+ // weak cipher suites obsoleted in TLS 1.1
+ add("SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
+ 0x0008, --p, K_RSA_EXPORT, B_DES_40, N, tls11);
+ add("SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
+ 0x0014, --p, K_DHE_RSA, B_DES_40, N, tls11);
+ add("SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
+ 0x0011, --p, K_DHE_DSS, B_DES_40, N, tls11);
+ add("SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
+ 0x0019, --p, K_DH_ANON, B_DES_40, N, tls11);
+
+ add("SSL_RSA_EXPORT_WITH_RC4_40_MD5",
+ 0x0003, --p, K_RSA_EXPORT, B_RC4_40, N, tls11);
+ add("SSL_DH_anon_EXPORT_WITH_RC4_40_MD5",
+ 0x0017, --p, K_DH_ANON, B_RC4_40, N, tls11);
add("TLS_RSA_WITH_NULL_SHA256",
0x003b, --p, K_RSA, B_NULL, N, max, tls12, P_SHA256);
@@ -1189,52 +1213,27 @@
add("SSL_RSA_WITH_NULL_MD5",
0x0001, --p, K_RSA, B_NULL, N);
- // weak cipher suites obsoleted in TLS 1.2
- add("SSL_RSA_WITH_DES_CBC_SHA",
- 0x0009, --p, K_RSA, B_DES, N, tls12);
- add("SSL_DHE_RSA_WITH_DES_CBC_SHA",
- 0x0015, --p, K_DHE_RSA, B_DES, N, tls12);
- add("SSL_DHE_DSS_WITH_DES_CBC_SHA",
- 0x0012, --p, K_DHE_DSS, B_DES, N, tls12);
- add("SSL_DH_anon_WITH_DES_CBC_SHA",
- 0x001a, --p, K_DH_ANON, B_DES, N, tls12);
-
- // weak cipher suites obsoleted in TLS 1.1
- add("SSL_RSA_EXPORT_WITH_RC4_40_MD5",
- 0x0003, --p, K_RSA_EXPORT, B_RC4_40, N, tls11);
- add("SSL_DH_anon_EXPORT_WITH_RC4_40_MD5",
- 0x0017, --p, K_DH_ANON, B_RC4_40, N, tls11);
-
- add("SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
- 0x0008, --p, K_RSA_EXPORT, B_DES_40, N, tls11);
- add("SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
- 0x0014, --p, K_DHE_RSA, B_DES_40, N, tls11);
- add("SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
- 0x0011, --p, K_DHE_DSS, B_DES_40, N, tls11);
- add("SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
- 0x0019, --p, K_DH_ANON, B_DES_40, N, tls11);
-
// Supported Kerberos ciphersuites from RFC2712
+ add("TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
+ 0x001f, --p, K_KRB5, B_3DES, N);
+ add("TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
+ 0x0023, --p, K_KRB5, B_3DES, N);
add("TLS_KRB5_WITH_RC4_128_SHA",
0x0020, --p, K_KRB5, B_RC4_128, N);
add("TLS_KRB5_WITH_RC4_128_MD5",
0x0024, --p, K_KRB5, B_RC4_128, N);
- add("TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
- 0x001f, --p, K_KRB5, B_3DES, N);
- add("TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
- 0x0023, --p, K_KRB5, B_3DES, N);
add("TLS_KRB5_WITH_DES_CBC_SHA",
0x001e, --p, K_KRB5, B_DES, N, tls12);
add("TLS_KRB5_WITH_DES_CBC_MD5",
0x0022, --p, K_KRB5, B_DES, N, tls12);
+ add("TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
+ 0x0026, --p, K_KRB5_EXPORT, B_DES_40, N, tls11);
+ add("TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5",
+ 0x0029, --p, K_KRB5_EXPORT, B_DES_40, N, tls11);
add("TLS_KRB5_EXPORT_WITH_RC4_40_SHA",
0x0028, --p, K_KRB5_EXPORT, B_RC4_40, N, tls11);
add("TLS_KRB5_EXPORT_WITH_RC4_40_MD5",
0x002b, --p, K_KRB5_EXPORT, B_RC4_40, N, tls11);
- add("TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
- 0x0026, --p, K_KRB5_EXPORT, B_DES_40, N, tls11);
- add("TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5",
- 0x0029, --p, K_KRB5_EXPORT, B_DES_40, N, tls11);
/*
* Other values from the TLS Cipher Suite Registry, as of August 2010.
--- a/jdk/src/java.base/unix/classes/java/lang/UNIXProcess.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/unix/classes/java/lang/UNIXProcess.java Fri Nov 21 14:58:29 2014 -0800
@@ -406,14 +406,17 @@
if (hasExited) return true;
if (timeout <= 0) return false;
- long timeoutAsNanos = unit.toNanos(timeout);
- long startTime = System.nanoTime();
- long rem = timeoutAsNanos;
+ long remainingNanos = unit.toNanos(timeout);
+ long deadline = System.nanoTime() + remainingNanos;
- while (!hasExited && (rem > 0)) {
- wait(Math.max(TimeUnit.NANOSECONDS.toMillis(rem), 1));
- rem = timeoutAsNanos - (System.nanoTime() - startTime);
- }
+ do {
+ // Round up to next millisecond
+ wait(TimeUnit.NANOSECONDS.toMillis(remainingNanos + 999_999L));
+ if (hasExited) {
+ return true;
+ }
+ remainingNanos = deadline - System.nanoTime();
+ } while (remainingNanos > 0);
return hasExited;
}
--- a/jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/windows/classes/java/lang/ProcessImpl.java Fri Nov 21 14:58:29 2014 -0800
@@ -461,11 +461,21 @@
if (getExitCodeProcess(handle) != STILL_ACTIVE) return true;
if (timeout <= 0) return false;
- long msTimeout = unit.toMillis(timeout);
+ long remainingNanos = unit.toNanos(timeout);
+ long deadline = System.nanoTime() + remainingNanos ;
- waitForTimeoutInterruptibly(handle, msTimeout);
- if (Thread.interrupted())
- throw new InterruptedException();
+ do {
+ // Round up to next millisecond
+ long msTimeout = TimeUnit.NANOSECONDS.toMillis(remainingNanos + 999_999L);
+ waitForTimeoutInterruptibly(handle, msTimeout);
+ if (Thread.interrupted())
+ throw new InterruptedException();
+ if (getExitCodeProcess(handle) != STILL_ACTIVE) {
+ return true;
+ }
+ remainingNanos = deadline - System.nanoTime();
+ } while (remainingNanos > 0);
+
return (getExitCodeProcess(handle) != STILL_ACTIVE);
}
--- a/jdk/src/java.base/windows/native/libnet/AbstractPlainDatagramSocketImpl.c Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.base/windows/native/libnet/AbstractPlainDatagramSocketImpl.c Fri Nov 21 14:58:29 2014 -0800
@@ -32,9 +32,11 @@
#include "java_net_AbstractPlainDatagramSocketImpl.h"
-static jfieldID IO_fd_fdID;
+static jfieldID IO_fd_fdID = NULL;
+static jfieldID apdsi_fdID = NULL;
-static jfieldID apdsi_fdID;
+static jfieldID apdsi_fd1ID = NULL;
+static jclass two_stacks_clazz = NULL;
/*
@@ -48,10 +50,21 @@
apdsi_fdID = (*env)->GetFieldID(env, cls, "fd",
"Ljava/io/FileDescriptor;");
CHECK_NULL(apdsi_fdID);
-
IO_fd_fdID = NET_GetFileDescriptorID(env);
CHECK_NULL(IO_fd_fdID);
+ two_stacks_clazz = (*env)->FindClass(env, "java/net/TwoStacksPlainDatagramSocketImpl");
+ CHECK_NULL(two_stacks_clazz);
+
+ /* Handle both TwoStacks and DualStack here */
+
+ if (JNU_Equals(env, cls, two_stacks_clazz)) {
+ /* fd1 present only in TwoStack.. */
+ apdsi_fd1ID = (*env)->GetFieldID(env, cls, "fd1",
+ "Ljava/io/FileDescriptor;");
+ CHECK_NULL(apdsi_fd1ID);
+ }
+
JNU_CHECK_EXCEPTION(env);
}
@@ -63,20 +76,38 @@
JNIEXPORT jint JNICALL Java_java_net_AbstractPlainDatagramSocketImpl_dataAvailable
(JNIEnv *env, jobject this) {
SOCKET fd;
- int retval;
-
+ SOCKET fd1;
+ int rv = -1, rv1 = -1;
jobject fdObj = (*env)->GetObjectField(env, this, apdsi_fdID);
- if (IS_NULL(fdObj)) {
+ if (!IS_NULL(fdObj)) {
+ int retval = 0;
+ fd = (SOCKET)(*env)->GetIntField(env, fdObj, IO_fd_fdID);
+ rv = ioctlsocket(fd, FIONREAD, &retval);
+ if (retval > 0) {
+ return retval;
+ }
+ }
+
+ if (!IS_NULL(apdsi_fd1ID)) {
+ /* TwoStacks */
+ jobject fd1Obj = (*env)->GetObjectField(env, this, apdsi_fd1ID);
+ if (!IS_NULL(fd1Obj)) {
+ int retval = 0;
+ fd1 = (SOCKET)(*env)->GetIntField(env, fd1Obj, IO_fd_fdID);
+ rv1 = ioctlsocket(fd1, FIONREAD, &retval);
+ if (retval > 0) {
+ return retval;
+ }
+ }
+ }
+
+ if (rv < 0 && rv1 < 0) {
JNU_ThrowByName(env, JNU_JAVANETPKG "SocketException",
- "Socket closed");
+ "Socket closed");
return -1;
}
- fd = (SOCKET)(*env)->GetIntField(env, fdObj, IO_fd_fdID);
- if (ioctlsocket(fd, FIONREAD, &retval) < 0) {
- return -1;
- }
- return retval;
+ return 0;
}
--- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java Fri Nov 21 14:58:29 2014 -0800
@@ -1882,6 +1882,9 @@
public synchronized void setWindowDeactivationTime(Window w, long time) {
AppContext ctx = getAppContext(w);
+ if (ctx == null) {
+ return;
+ }
@SuppressWarnings("unchecked")
WeakHashMap<Window, Long> map = (WeakHashMap<Window, Long>)ctx.get(DEACTIVATION_TIMES_MAP_KEY);
if (map == null) {
@@ -1893,6 +1896,9 @@
public synchronized long getWindowDeactivationTime(Window w) {
AppContext ctx = getAppContext(w);
+ if (ctx == null) {
+ return -1;
+ }
@SuppressWarnings("unchecked")
WeakHashMap<Window, Long> map = (WeakHashMap<Window, Long>)ctx.get(DEACTIVATION_TIMES_MAP_KEY);
if (map == null) {
--- a/jdk/src/java.management/share/classes/sun/management/Flag.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.management/share/classes/sun/management/Flag.java Fri Nov 21 14:58:29 2014 -0800
@@ -28,6 +28,7 @@
import java.util.*;
import com.sun.management.VMOption;
import com.sun.management.VMOption.Origin;
+import java.security.AccessController;
/**
* Flag class is a helper class for constructing a VMOption.
@@ -115,6 +116,13 @@
static synchronized native void setStringValue(String name, String value);
static {
+ AccessController.doPrivileged(
+ new java.security.PrivilegedAction<Void>() {
+ public Void run() {
+ System.loadLibrary("management");
+ return null;
+ }
+ });
initialize();
}
private static native void initialize();
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/NodeSetData.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/NodeSetData.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,9 +37,10 @@
*
* @author Sean Mullan
* @author JSR 105 Expert Group
+ * @param <T> the type of nodes maintained by this set
* @since 1.6
*/
-public interface NodeSetData extends Data {
+public interface NodeSetData<T> extends Data, Iterable<T> {
/**
* Returns a read-only iterator over the nodes contained in this
@@ -52,6 +53,5 @@
* @return an <code>Iterator</code> over the nodes in this
* <code>NodeSetData</code> in document order
*/
- @SuppressWarnings("rawtypes")
- Iterator iterator();
+ Iterator<T> iterator();
}
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dom/DOMCryptoContext.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -33,6 +33,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.Map;
import org.w3c.dom.Element;
/**
@@ -219,8 +220,7 @@
*
* @return a read-only iterator over the set of mappings
*/
- @SuppressWarnings("rawtypes")
- public Iterator iterator() {
+ public Iterator<Map.Entry<String, Element>> iterator() {
return Collections.unmodifiableMap(idMap).entrySet().iterator();
}
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Manifest.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,8 +51,8 @@
*
* <pre>
* XMLSignatureFactory factory = XMLSignatureFactory.getInstance("DOM");
- * List references = Collections.singletonList(factory.newReference
- * ("#reference-1", DigestMethod.SHA1));
+ * Reference ref = factory.newReference("#reference-1", DigestMethod.SHA1);
+ * List<Reference> references = Collections.singletonList(ref);
* Manifest manifest = factory.newManifest(references, "manifest-1");
* </pre>
*
@@ -86,6 +86,5 @@
*
* @return an unmodifiable list of one or more <code>Reference</code>s
*/
- @SuppressWarnings("rawtypes")
- List getReferences();
+ List<Reference> getReferences();
}
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/Reference.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -85,8 +85,7 @@
* @return an unmodifiable list of <code>Transform</code>s
* (may be empty but never <code>null</code>)
*/
- @SuppressWarnings("rawtypes")
- List getTransforms();
+ List<Transform> getTransforms();
/**
* Returns the digest method of this <code>Reference</code>.
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperties.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperties.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -87,6 +87,5 @@
* @return an unmodifiable list of one or more
* <code>SignatureProperty</code>s
*/
- @SuppressWarnings("rawtypes")
- List getProperties();
+ List<SignatureProperty> getProperties();
}
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperty.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignatureProperty.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -91,6 +91,5 @@
*
* @return an unmodifiable list of one or more <code>XMLStructure</code>s
*/
- @SuppressWarnings("rawtypes")
- List getContent();
+ List<XMLStructure> getContent();
}
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignedInfo.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/SignedInfo.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -80,8 +80,7 @@
*
* @return an unmodifiable list of one or more {@link Reference}s
*/
- @SuppressWarnings("rawtypes")
- List getReferences();
+ List<Reference> getReferences();
/**
* Returns the optional <code>Id</code> attribute of this
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLObject.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,7 +64,8 @@
*
* <pre>
* XMLSignatureFactory fac = XMLSignatureFactory.getInstance("DOM");
- * List content = Collections.singletonList(fac.newManifest(references)));
+ * Manifest manifest = fac.newManifest(references);
+ * List<XMLStructure> content = Collections.singletonList(manifest);
* XMLObject object = factory.newXMLObject(content, "object-1", null, null);
* </pre>
*
@@ -100,8 +101,7 @@
* @return an unmodifiable list of <code>XMLStructure</code>s (may be empty
* but never <code>null</code>)
*/
- @SuppressWarnings("rawtypes")
- List getContent();
+ List<XMLStructure> getContent();
/**
* Returns the Id of this <code>XMLObject</code>.
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignature.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignature.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -136,8 +136,7 @@
* @return an unmodifiable list of <code>XMLObject</code>s (may be empty
* but never <code>null</code>)
*/
- @SuppressWarnings("rawtypes")
- List getObjects();
+ List<XMLObject> getObjects();
/**
* Returns the optional Id of this <code>XMLSignature</code>.
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -365,9 +365,8 @@
* @throws ClassCastException if any of the <code>objects</code> are not of
* type <code>XMLObject</code>
*/
- @SuppressWarnings("rawtypes")
public abstract XMLSignature newXMLSignature(SignedInfo si, KeyInfo ki,
- List objects, String id, String signatureValueId);
+ List<? extends XMLObject> objects, String id, String signatureValueId);
/**
* Creates a <code>Reference</code> with the specified URI and digest
@@ -399,9 +398,8 @@
* compliant
* @throws NullPointerException if <code>dm</code> is <code>null</code>
*/
- @SuppressWarnings("rawtypes")
public abstract Reference newReference(String uri, DigestMethod dm,
- List transforms, String type, String id);
+ List<? extends Transform> transforms, String type, String id);
/**
* Creates a <code>Reference</code> with the specified parameters and
@@ -430,9 +428,9 @@
* @throws NullPointerException if <code>dm</code> or
* <code>digestValue</code> is <code>null</code>
*/
- @SuppressWarnings("rawtypes")
public abstract Reference newReference(String uri, DigestMethod dm,
- List transforms, String type, String id, byte[] digestValue);
+ List<? extends Transform> transforms, String type, String id,
+ byte[] digestValue);
/**
* Creates a <code>Reference</code> with the specified parameters.
@@ -473,10 +471,9 @@
* <code>appliedTransforms</code> or <code>result</code> is
* <code>null</code>
*/
- @SuppressWarnings("rawtypes")
public abstract Reference newReference(String uri, DigestMethod dm,
- List appliedTransforms, Data result, List transforms, String type,
- String id);
+ List<? extends Transform> appliedTransforms, Data result,
+ List<? extends Transform> transforms, String type, String id);
/**
* Creates a <code>SignedInfo</code> with the specified canonicalization
@@ -493,9 +490,8 @@
* @throws NullPointerException if any of the parameters
* are <code>null</code>
*/
- @SuppressWarnings("rawtypes")
public abstract SignedInfo newSignedInfo(CanonicalizationMethod cm,
- SignatureMethod sm, List references);
+ SignatureMethod sm, List<? extends Reference> references);
/**
* Creates a <code>SignedInfo</code> with the specified parameters.
@@ -512,9 +508,8 @@
* @throws NullPointerException if <code>cm</code>, <code>sm</code>, or
* <code>references</code> are <code>null</code>
*/
- @SuppressWarnings("rawtypes")
public abstract SignedInfo newSignedInfo(CanonicalizationMethod cm,
- SignatureMethod sm, List references, String id);
+ SignatureMethod sm, List<? extends Reference> references, String id);
// Object factory methods
/**
@@ -530,9 +525,8 @@
* @throws ClassCastException if <code>content</code> contains any
* entries that are not of type {@link XMLStructure}
*/
- @SuppressWarnings("rawtypes")
- public abstract XMLObject newXMLObject(List content, String id,
- String mimeType, String encoding);
+ public abstract XMLObject newXMLObject(List<? extends XMLStructure> content,
+ String id, String mimeType, String encoding);
/**
* Creates a <code>Manifest</code> containing the specified
@@ -547,8 +541,7 @@
* @throws ClassCastException if <code>references</code> contains any
* entries that are not of type {@link Reference}
*/
- @SuppressWarnings("rawtypes")
- public abstract Manifest newManifest(List references);
+ public abstract Manifest newManifest(List<? extends Reference> references);
/**
* Creates a <code>Manifest</code> containing the specified
@@ -564,8 +557,8 @@
* @throws ClassCastException if <code>references</code> contains any
* entries that are not of type {@link Reference}
*/
- @SuppressWarnings("rawtypes")
- public abstract Manifest newManifest(List references, String id);
+ public abstract Manifest newManifest(List<? extends Reference> references,
+ String id);
/**
* Creates a <code>SignatureProperty</code> containing the specified
@@ -583,9 +576,8 @@
* @throws ClassCastException if <code>content</code> contains any
* entries that are not of type {@link XMLStructure}
*/
- @SuppressWarnings("rawtypes")
public abstract SignatureProperty newSignatureProperty
- (List content, String target, String id);
+ (List<? extends XMLStructure> content, String target, String id);
/**
* Creates a <code>SignatureProperties</code> containing the specified
@@ -602,9 +594,8 @@
* @throws ClassCastException if <code>properties</code> contains any
* entries that are not of type {@link SignatureProperty}
*/
- @SuppressWarnings("rawtypes")
public abstract SignatureProperties newSignatureProperties
- (List properties, String id);
+ (List<? extends SignatureProperty> properties, String id);
// Algorithm factory methods
/**
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfo.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -94,8 +94,7 @@
* in this <code>KeyInfo</code>. Never returns <code>null</code> or an
* empty list.
*/
- @SuppressWarnings("rawtypes")
- List getContent();
+ List<XMLStructure> getContent();
/**
* Return the optional Id attribute of this <code>KeyInfo</code>, which
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/KeyInfoFactory.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -305,8 +305,7 @@
* @throws ClassCastException if <code>content</code> contains any entries
* that are not of type {@link XMLStructure}
*/
- @SuppressWarnings("rawtypes")
- public abstract KeyInfo newKeyInfo(List content);
+ public abstract KeyInfo newKeyInfo(List<? extends XMLStructure> content);
/**
* Creates a <code>KeyInfo</code> containing the specified list of key
@@ -325,8 +324,8 @@
* @throws ClassCastException if <code>content</code> contains any entries
* that are not of type {@link XMLStructure}
*/
- @SuppressWarnings("rawtypes")
- public abstract KeyInfo newKeyInfo(List content, String id);
+ public abstract KeyInfo newKeyInfo(List<? extends XMLStructure> content,
+ String id);
/**
* Creates a <code>KeyName</code> from the specified name.
@@ -387,9 +386,8 @@
* @throws ClassCastException if <code>other</code> contains any
* entries that are not of type {@link XMLStructure}
*/
- @SuppressWarnings("rawtypes")
public abstract PGPData newPGPData(byte[] keyId, byte[] keyPacket,
- List other);
+ List<? extends XMLStructure> other);
/**
* Creates a <code>PGPData</code> from the specified PGP key material
@@ -411,8 +409,8 @@
* @throws ClassCastException if <code>other</code> contains any
* entries that are not of type {@link XMLStructure}
*/
- @SuppressWarnings("rawtypes")
- public abstract PGPData newPGPData(byte[] keyPacket, List other);
+ public abstract PGPData newPGPData(byte[] keyPacket,
+ List<? extends XMLStructure> other);
/**
* Creates a <code>RetrievalMethod</code> from the specified URI.
@@ -443,9 +441,8 @@
* @throws ClassCastException if <code>transforms</code> contains any
* entries that are not of type {@link Transform}
*/
- @SuppressWarnings("rawtypes")
public abstract RetrievalMethod newRetrievalMethod(String uri, String type,
- List transforms);
+ List<? extends Transform> transforms);
/**
* Creates a <code>X509Data</code> containing the specified list of
@@ -469,8 +466,7 @@
* @throws ClassCastException if <code>content</code> contains any entries
* that are not of one of the valid types mentioned above
*/
- @SuppressWarnings("rawtypes")
- public abstract X509Data newX509Data(List content);
+ public abstract X509Data newX509Data(List<?> content);
/**
* Creates an <code>X509IssuerSerial</code> from the specified X.500 issuer
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/PGPData.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -112,6 +112,5 @@
* @return an unmodifiable list of <code>XMLStructure</code>s (may be
* empty, but never <code>null</code>)
*/
- @SuppressWarnings("rawtypes")
- List getExternalElements();
+ List<XMLStructure> getExternalElements();
}
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/RetrievalMethod.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -80,8 +80,7 @@
* @return an unmodifiable list of <code>Transform</code> objects (may be
* empty but never <code>null</code>).
*/
- @SuppressWarnings("rawtypes")
- List getTransforms();
+ List<Transform> getTransforms();
/**
* Returns the URI of the referenced <code>KeyInfo</code> information.
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/keyinfo/X509Data.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -109,6 +109,5 @@
* @return an unmodifiable list of the content in this <code>X509Data</code>
* (never <code>null</code> or empty)
*/
- @SuppressWarnings("rawtypes")
- List getContent();
+ List<?> getContent();
}
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java Fri Nov 21 14:58:29 2014 -0800
@@ -59,7 +59,7 @@
*/
public final class ExcC14NParameterSpec implements C14NMethodParameterSpec {
- private List<String> preList;
+ private final List<String> prefixList;
/**
* Indicates the default namespace ("#default").
@@ -71,7 +71,7 @@
* list.
*/
public ExcC14NParameterSpec() {
- preList = Collections.emptyList();
+ prefixList = Collections.emptyList();
}
/**
@@ -86,22 +86,14 @@
* @throws ClassCastException if any of the entries in the list are not
* of type <code>String</code>
*/
- @SuppressWarnings("rawtypes")
- public ExcC14NParameterSpec(List prefixList) {
+ public ExcC14NParameterSpec(List<String> prefixList) {
if (prefixList == null) {
throw new NullPointerException("prefixList cannot be null");
}
- List<?> copy = new ArrayList<>((List<?>)prefixList);
- for (int i = 0, size = copy.size(); i < size; i++) {
- if (!(copy.get(i) instanceof String)) {
- throw new ClassCastException("not a String");
- }
- }
-
- @SuppressWarnings("unchecked")
- List<String> temp = (List<String>)copy;
-
- preList = Collections.unmodifiableList(temp);
+ List<String> tempList = Collections.checkedList(new ArrayList<>(),
+ String.class);
+ tempList.addAll(prefixList);
+ this.prefixList = Collections.unmodifiableList(tempList);
}
/**
@@ -114,8 +106,7 @@
* @return the inclusive namespace prefix list (may be empty but never
* <code>null</code>)
*/
- @SuppressWarnings("rawtypes")
- public List getPrefixList() {
- return preList;
+ public List<String> getPrefixList() {
+ return prefixList;
}
}
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -59,27 +59,18 @@
* @throws NullPointerException if <code>xPathList</code> is
* <code>null</code>
*/
- @SuppressWarnings("rawtypes")
- public XPathFilter2ParameterSpec(List xPathList) {
+ public XPathFilter2ParameterSpec(List<XPathType> xPathList) {
if (xPathList == null) {
throw new NullPointerException("xPathList cannot be null");
}
- List<?> xPathListCopy = new ArrayList<>((List<?>)xPathList);
- if (xPathListCopy.isEmpty()) {
+ List<XPathType> tempList =
+ Collections.checkedList(new ArrayList<XPathType>(),
+ XPathType.class);
+ tempList.addAll(xPathList);
+ if (tempList.isEmpty()) {
throw new IllegalArgumentException("xPathList cannot be empty");
}
- int size = xPathListCopy.size();
- for (int i = 0; i < size; i++) {
- if (!(xPathListCopy.get(i) instanceof XPathType)) {
- throw new ClassCastException
- ("xPathList["+i+"] is not a valid type");
- }
- }
-
- @SuppressWarnings("unchecked")
- List<XPathType> temp = (List<XPathType>)xPathListCopy;
-
- this.xPathList = Collections.unmodifiableList(temp);
+ this.xPathList = Collections.unmodifiableList(tempList);
}
/**
@@ -91,8 +82,7 @@
* @return a <code>List</code> of <code>XPathType</code> objects
* (never <code>null</code> or empty)
*/
- @SuppressWarnings("rawtypes")
- public List getXPathList() {
+ public List<XPathType> getXPathList() {
return xPathList;
}
}
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import java.util.Map.Entry;
/**
* Parameters for the <a href="http://www.w3.org/TR/xmldsig-core/#sec-XPath">
@@ -51,8 +50,8 @@
*/
public final class XPathFilterParameterSpec implements TransformParameterSpec {
- private String xPath;
- private Map<String,String> nsMap;
+ private final String xPath;
+ private final Map<String,String> nsMap;
/**
* Creates an <code>XPathFilterParameterSpec</code> with the specified
@@ -83,26 +82,16 @@
* @throws ClassCastException if any of the map's keys or entries are not
* of type <code>String</code>
*/
- @SuppressWarnings("rawtypes")
- public XPathFilterParameterSpec(String xPath, Map namespaceMap) {
+ public XPathFilterParameterSpec(String xPath, Map<String,String> namespaceMap) {
if (xPath == null || namespaceMap == null) {
throw new NullPointerException();
}
this.xPath = xPath;
- Map<?,?> copy = new HashMap<>((Map<?,?>)namespaceMap);
- Iterator<? extends Map.Entry<?,?>> entries = copy.entrySet().iterator();
- while (entries.hasNext()) {
- Map.Entry<?,?> me = entries.next();
- if (!(me.getKey() instanceof String) ||
- !(me.getValue() instanceof String)) {
- throw new ClassCastException("not a String");
- }
- }
-
- @SuppressWarnings("unchecked")
- Map<String,String> temp = (Map<String,String>)copy;
-
- nsMap = Collections.unmodifiableMap(temp);
+ Map<String,String> tempMap = Collections.checkedMap(new HashMap<>(),
+ String.class,
+ String.class);
+ tempMap.putAll(namespaceMap);
+ this.nsMap = Collections.unmodifiableMap(tempMap);
}
/**
@@ -125,8 +114,7 @@
* @return a <code>Map</code> of namespace prefixes to namespace URIs (may
* be empty, but never <code>null</code>)
*/
- @SuppressWarnings("rawtypes")
- public Map getNamespaceMap() {
+ public Map<String,String> getNamespaceMap() {
return nsMap;
}
}
--- a/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathType.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/spec/XPathType.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
package javax.xml.crypto.dsig.spec;
import java.util.Collections;
-import java.util.Iterator;
import java.util.HashMap;
import java.util.Map;
@@ -106,7 +105,7 @@
private final String expression;
private final Filter filter;
- private Map<String,String> nsMap;
+ private final Map<String,String> nsMap;
/**
* Creates an <code>XPathType</code> instance with the specified XPath
@@ -147,26 +146,24 @@
* @throws ClassCastException if any of the map's keys or entries are
* not of type <code>String</code>
*/
- @SuppressWarnings("rawtypes")
- public XPathType(String expression, Filter filter, Map namespaceMap) {
- this(expression, filter);
+ public XPathType(String expression, Filter filter,
+ Map<String,String> namespaceMap) {
+ if (expression == null) {
+ throw new NullPointerException("expression cannot be null");
+ }
+ if (filter == null) {
+ throw new NullPointerException("filter cannot be null");
+ }
if (namespaceMap == null) {
throw new NullPointerException("namespaceMap cannot be null");
}
- Map<?,?> copy = new HashMap<>((Map<?,?>)namespaceMap);
- Iterator<? extends Map.Entry<?,?>> entries = copy.entrySet().iterator();
- while (entries.hasNext()) {
- Map.Entry<?,?> me = entries.next();
- if (!(me.getKey() instanceof String) ||
- !(me.getValue() instanceof String)) {
- throw new ClassCastException("not a String");
- }
- }
-
- @SuppressWarnings("unchecked")
- Map<String,String> temp = (Map<String,String>)copy;
-
- nsMap = Collections.unmodifiableMap(temp);
+ this.expression = expression;
+ this.filter = filter;
+ Map<String,String> tempMap = Collections.checkedMap(new HashMap<>(),
+ String.class,
+ String.class);
+ tempMap.putAll(namespaceMap);
+ this.nsMap = Collections.unmodifiableMap(tempMap);
}
/**
@@ -198,8 +195,7 @@
* @return a <code>Map</code> of namespace prefixes to namespace URIs
* (may be empty, but never <code>null</code>)
*/
- @SuppressWarnings("rawtypes")
- public Map getNamespaceMap() {
+ public Map<String,String> getNamespaceMap() {
return nsMap;
}
}
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheCanonicalizer.java Fri Nov 21 14:58:29 2014 -0800
@@ -21,7 +21,7 @@
* under the License.
*/
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
*/
/*
* $Id: ApacheCanonicalizer.java 1333869 2012-05-04 10:42:44Z coheigea $
@@ -166,11 +166,9 @@
(subTree.getRoot())));
}
} else if (data instanceof NodeSetData) {
- NodeSetData nsd = (NodeSetData)data;
- // convert Iterator to Set
- @SuppressWarnings("unchecked")
- Set<Node> ns = Utils.toNodeSet(nsd.iterator());
- nodeSet = ns;
+ NodeSetData<?> nsd = (NodeSetData<?>)data;
+ // convert Iterator to Set<Node>
+ nodeSet = Utils.toNodeSet(nsd.iterator());
if (log.isLoggable(java.util.logging.Level.FINE)) {
log.log(java.util.logging.Level.FINE, "Canonicalizing " + nodeSet.size() + " nodes");
}
@@ -236,7 +234,6 @@
in = new XMLSignatureInput(subTree.getRoot());
in.setExcludeComments(subTree.excludeComments());
} else {
- @SuppressWarnings("unchecked")
Set<Node> nodeSet =
Utils.toNodeSet(((NodeSetData)data).iterator());
in = new XMLSignatureInput(nodeSet);
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheNodeSetData.java Fri Nov 21 14:58:29 2014 -0800
@@ -39,7 +39,7 @@
import com.sun.org.apache.xml.internal.security.signature.XMLSignatureInput;
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
-public class ApacheNodeSetData implements ApacheData, NodeSetData {
+public class ApacheNodeSetData implements ApacheData, NodeSetData<Node> {
private XMLSignatureInput xi;
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/ApacheTransform.java Fri Nov 21 14:58:29 2014 -0800
@@ -21,7 +21,7 @@
* under the License.
*/
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
*/
/*
* $Id: ApacheTransform.java 1333869 2012-05-04 10:42:44Z coheigea $
@@ -175,7 +175,6 @@
in = new XMLSignatureInput(subTree.getRoot());
in.setExcludeComments(subTree.excludeComments());
} else {
- @SuppressWarnings("unchecked")
Set<Node> nodeSet =
Utils.toNodeSet(((NodeSetData)data).iterator());
in = new XMLSignatureInput(nodeSet);
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMExcC14NMethod.java Fri Nov 21 14:58:29 2014 -0800
@@ -21,7 +21,7 @@
* under the License.
*/
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
*/
/*
* $Id: DOMExcC14NMethod.java 1197150 2011-11-03 14:34:57Z coheigea $
@@ -119,7 +119,6 @@
ExcC14NParameterSpec params = (ExcC14NParameterSpec)spec;
StringBuilder prefixListAttr = new StringBuilder("");
- @SuppressWarnings("unchecked")
List<String> prefixList = params.getPrefixList();
for (int i = 0, size = prefixList.size(); i < size; i++) {
prefixListAttr.append(prefixList.get(i));
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfo.java Fri Nov 21 14:58:29 2014 -0800
@@ -68,17 +68,14 @@
if (content == null) {
throw new NullPointerException("content cannot be null");
}
- this.keyInfoTypes =
- Collections.unmodifiableList(new ArrayList<XMLStructure>(content));
+ List<XMLStructure> tempList =
+ Collections.checkedList(new ArrayList<XMLStructure>(),
+ XMLStructure.class);
+ tempList.addAll(content);
+ this.keyInfoTypes = Collections.unmodifiableList(tempList);
if (this.keyInfoTypes.isEmpty()) {
throw new IllegalArgumentException("content cannot be empty");
}
- for (int i = 0, size = this.keyInfoTypes.size(); i < size; i++) {
- if (!(this.keyInfoTypes.get(i) instanceof XMLStructure)) {
- throw new ClassCastException
- ("content["+i+"] is not a valid KeyInfo type");
- }
- }
this.id = id;
}
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyInfoFactory.java Fri Nov 21 14:58:29 2014 -0800
@@ -34,6 +34,7 @@
import java.util.List;
import javax.xml.crypto.*;
import javax.xml.crypto.dom.DOMCryptoContext;
+import javax.xml.crypto.dsig.Transform;
import javax.xml.crypto.dsig.keyinfo.*;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -48,13 +49,11 @@
public DOMKeyInfoFactory() { }
- @SuppressWarnings("rawtypes")
- public KeyInfo newKeyInfo(List content) {
+ public KeyInfo newKeyInfo(List<? extends XMLStructure> content) {
return newKeyInfo(content, null);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public KeyInfo newKeyInfo(List content, String id) {
+ public KeyInfo newKeyInfo(List<? extends XMLStructure> content, String id) {
return new DOMKeyInfo(content, id);
}
@@ -79,13 +78,13 @@
return newPGPData(keyId, null, null);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public PGPData newPGPData(byte[] keyId, byte[] keyPacket, List other) {
+ public PGPData newPGPData(byte[] keyId, byte[] keyPacket,
+ List<? extends XMLStructure> other) {
return new DOMPGPData(keyId, keyPacket, other);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public PGPData newPGPData(byte[] keyPacket, List other) {
+ public PGPData newPGPData(byte[] keyPacket,
+ List<? extends XMLStructure> other) {
return new DOMPGPData(keyPacket, other);
}
@@ -93,17 +92,15 @@
return newRetrievalMethod(uri, null, null);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
public RetrievalMethod newRetrievalMethod(String uri, String type,
- List transforms) {
+ List<? extends Transform> transforms) {
if (uri == null) {
throw new NullPointerException("uri must not be null");
}
return new DOMRetrievalMethod(uri, type, transforms);
}
- @SuppressWarnings("rawtypes")
- public X509Data newX509Data(List content) {
+ public X509Data newX509Data(List<?> content) {
return new DOMX509Data(content);
}
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMKeyValue.java Fri Nov 21 14:58:29 2014 -0800
@@ -33,7 +33,6 @@
import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.keyinfo.KeyValue;
-// import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.security.AccessController;
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMManifest.java Fri Nov 21 14:58:29 2014 -0800
@@ -67,18 +67,15 @@
if (references == null) {
throw new NullPointerException("references cannot be null");
}
- this.references =
- Collections.unmodifiableList(new ArrayList<Reference>(references));
+ List<Reference> tempList =
+ Collections.checkedList(new ArrayList<Reference>(),
+ Reference.class);
+ tempList.addAll(references);
+ this.references = Collections.unmodifiableList(tempList);
if (this.references.isEmpty()) {
throw new IllegalArgumentException("list of references must " +
"contain at least one entry");
}
- for (int i = 0, size = this.references.size(); i < size; i++) {
- if (!(this.references.get(i) instanceof Reference)) {
- throw new ClassCastException
- ("references["+i+"] is not a valid type");
- }
- }
this.id = id;
}
@@ -127,7 +124,6 @@
return id;
}
- @SuppressWarnings("unchecked")
static List<Reference> getManifestReferences(Manifest mf) {
return mf.getReferences();
}
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMPGPData.java Fri Nov 21 14:58:29 2014 -0800
@@ -73,18 +73,13 @@
if (keyPacket == null) {
throw new NullPointerException("keyPacket cannot be null");
}
- if (other == null || other.isEmpty()) {
- this.externalElements = Collections.emptyList();
- } else {
- this.externalElements =
- Collections.unmodifiableList(new ArrayList<XMLStructure>(other));
- for (int i = 0, size = this.externalElements.size(); i < size; i++) {
- if (!(this.externalElements.get(i) instanceof XMLStructure)) {
- throw new ClassCastException
- ("other["+i+"] is not a valid PGPData type");
- }
- }
+ List<XMLStructure> tempList =
+ Collections.checkedList(new ArrayList<XMLStructure>(),
+ XMLStructure.class);
+ if (other != null) {
+ tempList.addAll(other);
}
+ this.externalElements = Collections.unmodifiableList(tempList);
this.keyPacket = keyPacket.clone();
checkKeyPacket(keyPacket);
this.keyId = null;
@@ -120,18 +115,13 @@
if (keyId.length != 8) {
throw new IllegalArgumentException("keyId must be 8 bytes long");
}
- if (other == null || other.isEmpty()) {
- this.externalElements = Collections.emptyList();
- } else {
- this.externalElements =
- Collections.unmodifiableList(new ArrayList<XMLStructure>(other));
- for (int i = 0, size = this.externalElements.size(); i < size; i++) {
- if (!(this.externalElements.get(i) instanceof XMLStructure)) {
- throw new ClassCastException
- ("other["+i+"] is not a valid PGPData type");
- }
- }
+ List<XMLStructure> tempList =
+ Collections.checkedList(new ArrayList<XMLStructure>(),
+ XMLStructure.class);
+ if (other != null) {
+ tempList.addAll(other);
}
+ this.externalElements = Collections.unmodifiableList(tempList);
this.keyId = keyId.clone();
this.keyPacket = keyPacket == null ? null
: keyPacket.clone();
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMReference.java Fri Nov 21 14:58:29 2014 -0800
@@ -147,29 +147,21 @@
if (dm == null) {
throw new NullPointerException("DigestMethod must be non-null");
}
- if (appliedTransforms == null) {
- this.allTransforms = new ArrayList<Transform>();
- } else {
- this.allTransforms = new ArrayList<Transform>(appliedTransforms);
- for (int i = 0, size = this.allTransforms.size(); i < size; i++) {
- if (!(this.allTransforms.get(i) instanceof Transform)) {
- throw new ClassCastException
- ("appliedTransforms["+i+"] is not a valid type");
- }
- }
+ List<Transform> tempList =
+ Collections.checkedList(new ArrayList<Transform>(),
+ Transform.class);
+ if (appliedTransforms != null) {
+ tempList.addAll(appliedTransforms);
}
- if (transforms == null) {
- this.transforms = Collections.emptyList();
- } else {
- this.transforms = new ArrayList<Transform>(transforms);
- for (int i = 0, size = this.transforms.size(); i < size; i++) {
- if (!(this.transforms.get(i) instanceof Transform)) {
- throw new ClassCastException
- ("transforms["+i+"] is not a valid type");
- }
- }
- this.allTransforms.addAll(this.transforms);
+ List<Transform> tempList2 =
+ Collections.checkedList(new ArrayList<Transform>(),
+ Transform.class);
+ if (transforms != null) {
+ tempList.addAll(transforms);
+ tempList2.addAll(transforms);
}
+ this.allTransforms = Collections.unmodifiableList(tempList);
+ this.transforms = tempList2;
this.digestMethod = dm;
this.uri = uri;
if ((uri != null) && (!uri.equals(""))) {
@@ -642,7 +634,7 @@
if (xsi.isNodeSet()) {
try {
final Set<Node> s = xsi.getNodeSet();
- return new NodeSetData() {
+ return new NodeSetData<Node>() {
public Iterator<Node> iterator() { return s.iterator(); }
};
} catch (Exception e) {
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMRetrievalMethod.java Fri Nov 21 14:58:29 2014 -0800
@@ -90,18 +90,13 @@
if (uri == null) {
throw new NullPointerException("uri cannot be null");
}
- if (transforms == null || transforms.isEmpty()) {
- this.transforms = Collections.emptyList();
- } else {
- this.transforms = Collections.unmodifiableList(
- new ArrayList<Transform>(transforms));
- for (int i = 0, size = this.transforms.size(); i < size; i++) {
- if (!(this.transforms.get(i) instanceof Transform)) {
- throw new ClassCastException
- ("transforms["+i+"] is not a valid type");
- }
- }
+ List<Transform> tempList =
+ Collections.checkedList(new ArrayList<Transform>(),
+ Transform.class);
+ if (transforms != null) {
+ tempList.addAll(transforms);
}
+ this.transforms = Collections.unmodifiableList(tempList);
this.uri = uri;
if (!uri.equals("")) {
try {
@@ -244,7 +239,7 @@
// guard against RetrievalMethod loops
if ((data instanceof NodeSetData) && Utils.secureValidation(context)) {
- NodeSetData nsd = (NodeSetData)data;
+ NodeSetData<?> nsd = (NodeSetData<?>)data;
Iterator<?> i = nsd.iterator();
if (i.hasNext()) {
Node root = (Node)i.next();
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperties.java Fri Nov 21 14:58:29 2014 -0800
@@ -69,18 +69,15 @@
{
if (properties == null) {
throw new NullPointerException("properties cannot be null");
- } else if (properties.isEmpty()) {
+ }
+ List<SignatureProperty> tempList =
+ Collections.checkedList(new ArrayList<SignatureProperty>(),
+ SignatureProperty.class);
+ tempList.addAll(properties);
+ if (tempList.isEmpty()) {
throw new IllegalArgumentException("properties cannot be empty");
- } else {
- this.properties = Collections.unmodifiableList(
- new ArrayList<SignatureProperty>(properties));
- for (int i = 0, size = this.properties.size(); i < size; i++) {
- if (!(this.properties.get(i) instanceof SignatureProperty)) {
- throw new ClassCastException
- ("properties["+i+"] is not a valid type");
- }
- }
}
+ this.properties = Collections.unmodifiableList(tempList);
this.id = id;
}
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java Fri Nov 21 14:58:29 2014 -0800
@@ -71,20 +71,18 @@
{
if (target == null) {
throw new NullPointerException("target cannot be null");
- } else if (content == null) {
+ }
+ if (content == null) {
throw new NullPointerException("content cannot be null");
- } else if (content.isEmpty()) {
+ }
+ List<XMLStructure> tempList =
+ Collections.checkedList(new ArrayList<XMLStructure>(),
+ XMLStructure.class);
+ tempList.addAll(content);
+ if (tempList.isEmpty()) {
throw new IllegalArgumentException("content cannot be empty");
- } else {
- this.content = Collections.unmodifiableList(
- new ArrayList<XMLStructure>(content));
- for (int i = 0, size = this.content.size(); i < size; i++) {
- if (!(this.content.get(i) instanceof XMLStructure)) {
- throw new ClassCastException
- ("content["+i+"] is not a valid type");
- }
- }
}
+ this.content = Collections.unmodifiableList(tempList);
this.target = target;
this.id = id;
}
@@ -169,7 +167,6 @@
boolean idsEqual = (id == null ? osp.getId() == null
: id.equals(osp.getId()));
- @SuppressWarnings("unchecked")
List<XMLStructure> ospContent = osp.getContent();
return (equalsContent(ospContent) &&
target.equals(osp.getTarget()) && idsEqual);
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignedInfo.java Fri Nov 21 14:58:29 2014 -0800
@@ -100,19 +100,14 @@
}
this.canonicalizationMethod = cm;
this.signatureMethod = sm;
- this.references = Collections.unmodifiableList(
- new ArrayList<Reference>(references));
- if (this.references.isEmpty()) {
- throw new IllegalArgumentException("list of references must " +
- "contain at least one entry");
+ List<Reference> tempList =
+ Collections.checkedList(new ArrayList<Reference>(),
+ Reference.class);
+ tempList.addAll(references);
+ if (tempList.isEmpty()) {
+ throw new IllegalArgumentException("references cannot be empty");
}
- for (int i = 0, size = this.references.size(); i < size; i++) {
- Object obj = this.references.get(i);
- if (!(obj instanceof Reference)) {
- throw new ClassCastException("list of references contains " +
- "an illegal type");
- }
- }
+ this.references = Collections.unmodifiableList(tempList);
}
/**
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMSubTreeData.java Fri Nov 21 14:58:29 2014 -0800
@@ -44,7 +44,7 @@
* directly on the subdocument and there is no need to convert it
* first to an XPath node-set.
*/
-public class DOMSubTreeData implements NodeSetData {
+public class DOMSubTreeData implements NodeSetData<Node> {
private boolean excludeComments;
private Node root;
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMUtils.java Fri Nov 21 14:58:29 2014 -0800
@@ -367,9 +367,7 @@
private static boolean paramsEqual(XPathFilter2ParameterSpec spec1,
XPathFilter2ParameterSpec spec2)
{
- @SuppressWarnings("unchecked")
List<XPathType> types = spec1.getXPathList();
- @SuppressWarnings("unchecked")
List<XPathType> otypes = spec2.getXPathList();
int size = types.size();
if (size != otypes.size()) {
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMX509Data.java Fri Nov 21 14:58:29 2014 -0800
@@ -135,7 +135,7 @@
this.content = Collections.unmodifiableList(content);
}
- public List<Object> getContent() {
+ public List<?> getContent() {
return content;
}
@@ -265,7 +265,7 @@
}
X509Data oxd = (X509Data)o;
- @SuppressWarnings("unchecked") List<Object> ocontent = oxd.getContent();
+ List<?> ocontent = oxd.getContent();
int size = content.size();
if (size != ocontent.size()) {
return false;
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLObject.java Fri Nov 21 14:58:29 2014 -0800
@@ -70,18 +70,13 @@
public DOMXMLObject(List<? extends XMLStructure> content, String id,
String mimeType, String encoding)
{
- if (content == null || content.isEmpty()) {
- this.content = Collections.emptyList();
- } else {
- this.content = Collections.unmodifiableList(
- new ArrayList<XMLStructure>(content));
- for (int i = 0, size = this.content.size(); i < size; i++) {
- if (!(this.content.get(i) instanceof XMLStructure)) {
- throw new ClassCastException
- ("content["+i+"] is not a valid type");
- }
- }
+ List<XMLStructure> tempList =
+ Collections.checkedList(new ArrayList<XMLStructure>(),
+ XMLStructure.class);
+ if (content != null) {
+ tempList.addAll(content);
}
+ this.content = Collections.unmodifiableList(tempList);
this.id = id;
this.mimeType = mimeType;
this.encoding = encoding;
@@ -204,7 +199,6 @@
(mimeType == null ? oxo.getMimeType() == null
: mimeType.equals(oxo.getMimeType()));
- @SuppressWarnings("unchecked")
List<XMLStructure> oxoContent = oxo.getContent();
return (idsEqual && encodingsEqual && mimeTypesEqual &&
equalsContent(oxoContent));
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignature.java Fri Nov 21 14:58:29 2014 -0800
@@ -109,18 +109,13 @@
this.si = si;
this.id = id;
this.sv = new DOMSignatureValue(signatureValueId);
- if (objs == null) {
- this.objects = Collections.emptyList();
- } else {
- this.objects =
- Collections.unmodifiableList(new ArrayList<XMLObject>(objs));
- for (int i = 0, size = this.objects.size(); i < size; i++) {
- if (!(this.objects.get(i) instanceof XMLObject)) {
- throw new ClassCastException
- ("objs["+i+"] is not an XMLObject");
- }
- }
+ List<XMLObject> tempList =
+ Collections.checkedList(new ArrayList<XMLObject>(),
+ XMLObject.class);
+ if (objs != null) {
+ tempList.addAll(objs);
}
+ this.objects = Collections.unmodifiableList(tempList);
this.ki = ki;
}
@@ -270,7 +265,6 @@
}
// validate all References
- @SuppressWarnings("unchecked")
List<Reference> refs = this.si.getReferences();
boolean validateRefs = true;
for (int i = 0, size = refs.size(); validateRefs && i < size; i++) {
@@ -297,7 +291,6 @@
{
for (int i=0, size=objects.size(); validateMans && i < size; i++) {
XMLObject xo = objects.get(i);
- @SuppressWarnings("unchecked")
List<XMLStructure> content = xo.getContent();
int csize = content.size();
for (int j = 0; validateMans && j < csize; j++) {
@@ -307,7 +300,6 @@
log.log(java.util.logging.Level.FINE, "validating manifest");
}
Manifest man = (Manifest)xs;
- @SuppressWarnings("unchecked")
List<Reference> manRefs = man.getReferences();
int rsize = manRefs.size();
for (int k = 0; validateMans && k < rsize; k++) {
@@ -348,20 +340,17 @@
signatureIdMap = new HashMap<String, XMLStructure>();
signatureIdMap.put(id, this);
signatureIdMap.put(si.getId(), si);
- @SuppressWarnings("unchecked")
List<Reference> refs = si.getReferences();
for (Reference ref : refs) {
signatureIdMap.put(ref.getId(), ref);
}
for (XMLObject obj : objects) {
signatureIdMap.put(obj.getId(), obj);
- @SuppressWarnings("unchecked")
List<XMLStructure> content = obj.getContent();
for (XMLStructure xs : content) {
if (xs instanceof Manifest) {
Manifest man = (Manifest)xs;
signatureIdMap.put(man.getId(), man);
- @SuppressWarnings("unchecked")
List<Reference> manRefs = man.getReferences();
for (Reference ref : manRefs) {
allReferences.add(ref);
@@ -483,7 +472,6 @@
// reference dependencies in the XPath Transform - so be on
// the safe side, and skip and do at end in the final sweep
if (uri.length() == 0) {
- @SuppressWarnings("unchecked")
List<Transform> transforms = ref.getTransforms();
for (Transform transform : transforms) {
String transformAlg = transform.getAlgorithm();
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXMLSignatureFactory.java Fri Nov 21 14:58:29 2014 -0800
@@ -58,9 +58,8 @@
return new DOMXMLSignature(si, ki, null, null, null);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
public XMLSignature newXMLSignature(SignedInfo si, KeyInfo ki,
- List objects, String id, String signatureValueId) {
+ List<? extends XMLObject> objects, String id, String signatureValueId) {
return new DOMXMLSignature(si, ki, objects, id, signatureValueId);
}
@@ -68,16 +67,14 @@
return newReference(uri, dm, null, null, null);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public Reference newReference(String uri, DigestMethod dm, List transforms,
- String type, String id) {
+ public Reference newReference(String uri, DigestMethod dm,
+ List<? extends Transform> transforms, String type, String id) {
return new DOMReference(uri, type, dm, transforms, id, getProvider());
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
public Reference newReference(String uri, DigestMethod dm,
- List appliedTransforms, Data result, List transforms, String type,
- String id) {
+ List<? extends Transform> appliedTransforms, Data result,
+ List<? extends Transform> transforms, String type, String id) {
if (appliedTransforms == null) {
throw new NullPointerException("appliedTransforms cannot be null");
}
@@ -91,9 +88,9 @@
(uri, type, dm, appliedTransforms, result, transforms, id, getProvider());
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public Reference newReference(String uri, DigestMethod dm, List transforms,
- String type, String id, byte[] digestValue) {
+ public Reference newReference(String uri, DigestMethod dm,
+ List<? extends Transform> transforms, String type, String id,
+ byte[] digestValue) {
if (digestValue == null) {
throw new NullPointerException("digestValue cannot be null");
}
@@ -101,43 +98,38 @@
(uri, type, dm, null, null, transforms, id, digestValue, getProvider());
}
- @SuppressWarnings("rawtypes")
public SignedInfo newSignedInfo(CanonicalizationMethod cm,
- SignatureMethod sm, List references) {
+ SignatureMethod sm, List<? extends Reference> references) {
return newSignedInfo(cm, sm, references, null);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
public SignedInfo newSignedInfo(CanonicalizationMethod cm,
- SignatureMethod sm, List references, String id) {
+ SignatureMethod sm, List<? extends Reference> references, String id) {
return new DOMSignedInfo(cm, sm, references, id);
}
// Object factory methods
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public XMLObject newXMLObject(List content, String id, String mimeType,
- String encoding) {
+ public XMLObject newXMLObject(List<? extends XMLStructure> content,
+ String id, String mimeType, String encoding) {
return new DOMXMLObject(content, id, mimeType, encoding);
}
- @SuppressWarnings("rawtypes")
- public Manifest newManifest(List references) {
+ public Manifest newManifest(List<? extends Reference> references) {
return newManifest(references, null);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public Manifest newManifest(List references, String id) {
+ public Manifest newManifest(List<? extends Reference> references,
+ String id) {
return new DOMManifest(references, id);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
- public SignatureProperties newSignatureProperties(List props, String id) {
+ public SignatureProperties newSignatureProperties(
+ List<? extends SignatureProperty> props, String id) {
return new DOMSignatureProperties(props, id);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
public SignatureProperty newSignatureProperty
- (List info, String target, String id) {
+ (List<? extends XMLStructure> info, String target, String id) {
return new DOMSignatureProperty(info, target, id);
}
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Fri Nov 21 14:58:29 2014 -0800
@@ -133,7 +133,6 @@
String prefix = DOMUtils.getNSPrefix(context, Transform.XPATH2);
String qname = (prefix == null || prefix.length() == 0)
? "xmlns" : "xmlns:" + prefix;
- @SuppressWarnings("unchecked")
List<XPathType> xpathList = xp.getXPathList();
for (XPathType xpathType : xpathList) {
Element elem = DOMUtils.createElement(ownerDoc, "XPath",
@@ -146,7 +145,6 @@
Transform.XPATH2);
// add namespace attributes, if necessary
- @SuppressWarnings("unchecked")
Set<Map.Entry<String, String>> entries =
xpathType.getNamespaceMap().entrySet();
for (Map.Entry<String, String> entry : entries) {
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Fri Nov 21 14:58:29 2014 -0800
@@ -99,7 +99,6 @@
xpathElem.appendChild(ownerDoc.createTextNode(xp.getXPath()));
// add namespace attributes, if necessary
- @SuppressWarnings("unchecked")
Set<Map.Entry<String, String>> entries =
xp.getNamespaceMap().entrySet();
for (Map.Entry<String, String> entry : entries) {
--- a/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal/dom/Utils.java Fri Nov 21 14:58:29 2014 -0800
@@ -70,10 +70,10 @@
* @param i the Iterator
* @return the Set of Nodes
*/
- static Set<Node> toNodeSet(Iterator<Node> i) {
+ static Set<Node> toNodeSet(Iterator<?> i) {
Set<Node> nodeSet = new HashSet<Node>();
while (i.hasNext()) {
- Node n = i.next();
+ Node n = (Node)i.next();
nodeSet.add(n);
// insert attributes nodes to comply with XPath
if (n.getNodeType() == Node.ELEMENT_NODE) {
--- a/jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/jdk.deploy.osx/macosx/native/libosx/KeystoreImpl.m Fri Nov 21 14:58:29 2014 -0800
@@ -300,11 +300,21 @@
// Make a java array of certificate data from the chain.
jclass byteArrayClass = (*env)->FindClass(env, "[B");
+ if (byteArrayClass == NULL) {
+ goto errOut;
+ }
jobjectArray javaCertArray = (*env)->NewObjectArray(env, certCount, byteArrayClass, NULL);
+ // Cleanup first then check for a NULL return code
(*env)->DeleteLocalRef(env, byteArrayClass);
+ if (javaCertArray == NULL) {
+ goto errOut;
+ }
// And, make an array of the certificate refs.
jlongArray certRefArray = (*env)->NewLongArray(env, certCount);
+ if (certRefArray == NULL) {
+ goto errOut;
+ }
SecCertificateRef currCertRef = NULL;
@@ -319,6 +329,9 @@
bzero(&currCertData, sizeof(CSSM_DATA));
err = SecCertificateGetData(currCertRef, &currCertData);
jbyteArray encodedCertData = (*env)->NewByteArray(env, currCertData.Length);
+ if (encodedCertData == NULL) {
+ goto errOut;
+ }
(*env)->SetByteArrayRegion(env, encodedCertData, 0, currCertData.Length, (jbyte *)currCertData.Data);
(*env)->SetObjectArrayElement(env, javaCertArray, i, encodedCertData);
jlong certRefElement = ptr_to_jlong(currCertRef);
@@ -331,6 +344,9 @@
// Find the label. It's a 'blob', but we interpret as characters.
jstring alias = getLabelFromItem(env, (SecKeychainItemRef)certificate);
+ if (alias == NULL) {
+ goto errOut;
+ }
// Find the creation date.
jlong creationDate = getModDateFromItem(env, (SecKeychainItemRef)certificate);
@@ -341,6 +357,7 @@
}
} while (searchResult == noErr);
+errOut:
if (identitySearch != NULL) {
CFRelease(identitySearch);
}
@@ -363,10 +380,16 @@
CSSM_DATA currCertificate;
err = SecCertificateGetData(certRef, &currCertificate);
jbyteArray certData = (*env)->NewByteArray(env, currCertificate.Length);
+ if (certData == NULL) {
+ goto errOut;
+ }
(*env)->SetByteArrayRegion(env, certData, 0, currCertificate.Length, (jbyte *)currCertificate.Data);
// Find the label. It's a 'blob', but we interpret as characters.
jstring alias = getLabelFromItem(env, theItem);
+ if (alias == NULL) {
+ goto errOut;
+ }
// Find the creation date.
jlong creationDate = getModDateFromItem(env, theItem);
@@ -377,6 +400,7 @@
}
} while (searchResult == noErr);
+errOut:
if (keychainItemSearch != NULL) {
CFRelease(keychainItemSearch);
}
@@ -405,6 +429,9 @@
if (passwordLen > 0) {
passwordChars = (*env)->GetCharArrayElements(env, passwordObj, NULL);
+ if (passwordChars == NULL) {
+ goto errOut;
+ }
passwordStrRef = CFStringCreateWithCharacters(kCFAllocatorDefault, passwordChars, passwordLen);
}
}
@@ -424,9 +451,13 @@
if (err == noErr) {
CFIndex size = CFDataGetLength(exportedData);
returnValue = (*env)->NewByteArray(env, size);
+ if (returnValue == NULL) {
+ goto errOut;
+ }
(*env)->SetByteArrayRegion(env, returnValue, 0, size, (jbyte *)CFDataGetBytePtr(exportedData));
}
+errOut:
if (exportedData) CFRelease(exportedData);
if (passwordStrRef) CFRelease(passwordStrRef);
@@ -467,6 +498,9 @@
jsize dataSize = (*env)->GetArrayLength(env, rawDataObj);
jbyte *rawData = (*env)->GetByteArrayElements(env, rawDataObj, NULL);
+ if (rawData == NULL) {
+ goto errOut;
+ }
CFDataRef cfDataToImport = CFDataCreate(kCFAllocatorDefault, (UInt8 *)rawData, dataSize);
CFArrayRef createdItems = NULL;
@@ -523,6 +557,8 @@
CFRelease(createdItems);
}
+errOut: ;
+
JNF_COCOA_EXIT(env);
return returnValue;
--- a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -82,6 +82,7 @@
private Timer timer, timer1;
private Logger logger;
+ private Thread dispatcherThread;
ServerImpl (
HttpServer wrapper, String protocol, InetSocketAddress addr, int backlog
@@ -141,9 +142,9 @@
if (executor == null) {
executor = new DefaultExecutor();
}
- Thread t = new Thread (dispatcher);
+ dispatcherThread = new Thread (dispatcher);
started = true;
- t.start();
+ dispatcherThread.start();
}
public void setExecutor (Executor executor) {
@@ -205,6 +206,12 @@
if (timer1Enabled) {
timer1.cancel();
}
+ try {
+ dispatcherThread.join();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ logger.log(Level.FINER, "ServerImpl.stop: ", e);
+ }
}
Dispatcher dispatcher;
--- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/debugLoop.c Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
static volatile struct PacketList *cmdQueue;
static jrawMonitorID cmdQueueLock;
-static jrawMonitorID resumeLock;
+static jrawMonitorID vmDeathLock;
static jboolean transportError;
static jboolean
@@ -60,28 +60,17 @@
}
}
-static jboolean
-resumeCommand(jdwpCmdPacket *cmd)
-{
- if ( (cmd->cmdSet == JDWP_COMMAND_SET(VirtualMachine)) &&
- (cmd->cmd == JDWP_COMMAND(VirtualMachine, Resume)) ) {
- return JNI_TRUE;
- } else {
- return JNI_FALSE;
- }
-}
-
void
debugLoop_initialize(void)
{
- resumeLock = debugMonitorCreate("JDWP Resume Lock");
+ vmDeathLock = debugMonitorCreate("JDWP VM_DEATH Lock");
}
void
debugLoop_sync(void)
{
- debugMonitorEnter(resumeLock);
- debugMonitorExit(resumeLock);
+ debugMonitorEnter(vmDeathLock);
+ debugMonitorExit(vmDeathLock);
}
/*
@@ -136,14 +125,14 @@
jboolean replyToSender = JNI_TRUE;
/*
- * For VirtualMachine.Resume commands we hold the resumeLock
+ * For VirtualMachine commands we hold the vmDeathLock
* while executing and replying to the command. This ensures
- * that a Resume after VM_DEATH will be allowed to complete
+ * that a VM command after VM_DEATH will be allowed to complete
* before the thread posting the VM_DEATH continues VM
* termination.
*/
- if (resumeCommand(cmd)) {
- debugMonitorEnter(resumeLock);
+ if (cmd->cmdSet == JDWP_COMMAND_SET(VirtualMachine)){
+ debugMonitorEnter(vmDeathLock);
}
/* Initialize the input and output streams */
@@ -181,10 +170,10 @@
}
/*
- * Release the resumeLock as the reply has been posted.
+ * Release the vmDeathLock as the reply has been posted.
*/
- if (resumeCommand(cmd)) {
- debugMonitorExit(resumeLock);
+ if (cmd->cmdSet == JDWP_COMMAND_SET(VirtualMachine)){
+ debugMonitorExit(vmDeathLock);
}
inStream_destroy(&in);
--- a/jdk/test/ProblemList.txt Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/ProblemList.txt Fri Nov 21 14:58:29 2014 -0800
@@ -127,6 +127,10 @@
# 8058536
java/lang/instrument/NativeMethodPrefixAgent.java generic-all
+# 8061177
+java/lang/instrument/RedefineBigClass.sh generic-all
+java/lang/instrument/RetransformBigClass.sh generic-all
+
############################################################################
# jdk_management
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/com/sun/net/httpserver/SimpleHttpServerTest.java Fri Nov 21 14:58:29 2014 -0800
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8015692
+ * @summary Test HttpServer instantiation, start, and stop repeated in a loop
+ * Testing for Bind exception on Windows
+ */
+
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+
+import com.sun.net.httpserver.HttpServer;
+
+
+public class SimpleHttpServerTest {
+
+ public static void main(String[] args) throws Exception {
+
+ System.out.println(System.getProperty("java.version"));
+ InetSocketAddress serverAddr = new InetSocketAddress(0);
+ HttpServer server = HttpServer.create(serverAddr, 0);
+ final int serverPort = server.getAddress().getPort();
+ server.start();
+ server.stop(0);
+ serverAddr = new InetSocketAddress(serverPort);
+ int exceptionCount = 0;
+ System.out.println("Using serverPort == " + serverPort);
+ for (int i = 0; i < 100; i++) {
+ try {
+ server = HttpServer.create(serverAddr, 0);
+ server.start();
+ server.stop(0);
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ exceptionCount++;
+ }
+ }
+ if (exceptionCount > 0) {
+ throw new RuntimeException("Test Failed");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/Class/getFields/Sanity.java Fri Nov 21 14:58:29 2014 -0800
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2014 Google, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8063147
+ * @summary Tests for Class.getFields().
+ * @run testng Sanity
+ */
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+public class Sanity {
+ public interface EmptyInterface {}
+ class EmptyClass {}
+ interface BI1 {
+ public int i = 1;
+ int j = 2;
+ }
+ interface BI2 {
+ int k = 1;
+ }
+ public interface DI extends BI1, BI2, EmptyInterface {
+ int m = 5;
+ }
+ interface DDI extends DI {
+ int n = 6;
+ }
+
+ public class D extends EmptyClass {
+ public int publicDField;
+ protected int protectedDField;
+ private int privateDField;
+ }
+
+ class DD extends D {
+ public int publicDDField;
+ protected int protectedDDField;
+ private int privateDDField;
+ }
+
+ public class Universe extends DD implements DDI {
+ public int publicUniverseField;
+ protected int protectedUniverseField;
+ private int privateUniverseField;
+ }
+
+ void assertContainsNoFields(Class<?> clazz) {
+ assertEquals(clazz.getFields().length, 0);
+ }
+
+ @Test
+ public void primitiveTypesHaveNoFields() throws Exception {
+ assertContainsNoFields(byte.class);
+ assertContainsNoFields(char.class);
+ assertContainsNoFields(short.class);
+ assertContainsNoFields(int.class);
+ assertContainsNoFields(long.class);
+ assertContainsNoFields(boolean.class);
+ assertContainsNoFields(void.class);
+ assertContainsNoFields(double.class);
+ assertContainsNoFields(float.class);
+ }
+
+ @Test
+ public void arrayTypesHaveNoFields() throws Exception {
+ assertContainsNoFields(byte[].class);
+ assertContainsNoFields(Object[].class);
+ assertContainsNoFields(java.util.Map[].class);
+ assertContainsNoFields(java.util.HashMap[].class);
+ }
+
+ @Test
+ public void emptyInterfacesHaveNoFields() throws Exception {
+ assertContainsNoFields(EmptyInterface.class);
+ }
+
+ @Test
+ public void emptyClassesHaveNoFields() throws Exception {
+ assertContainsNoFields(EmptyClass.class);
+ class EmptyLocalClass {}
+ assertContainsNoFields(EmptyLocalClass.class);
+ }
+
+ void assertContainsFields(Class<?> clazz, int count) {
+ assertEquals(clazz.getFields().length, count);
+ }
+
+ @Test
+ public void checkFieldCounts() throws Exception {
+ assertContainsFields(BI1.class, 2);
+ assertContainsFields(BI2.class, 1);
+ assertContainsFields(DI.class, 4);
+ assertContainsFields(DDI.class, 5);
+ assertContainsFields(D.class, 1);
+ assertContainsFields(DD.class, 2);
+ assertContainsFields(Universe.class, 8);
+ }
+
+ void assertContainsFields(Class<?> derived, Class<?> base) {
+ List<Field> derivedFields = Arrays.asList(derived.getFields());
+ List<Field> baseFields = Arrays.asList(base.getFields());
+ assertTrue(derivedFields.containsAll(baseFields));
+ }
+
+ List<Class<?>> directSupers(Class<?> clazz) {
+ List<Class<?>> directSupers = new ArrayList<>();
+ directSupers.addAll(Arrays.asList(clazz.getInterfaces()));
+ if (clazz.getSuperclass() != null) {
+ directSupers.add(clazz.getSuperclass());
+ }
+ return directSupers;
+ }
+
+ void assertContainsSuperFields(Class<?> clazz) {
+ for (Class<?> directSuper : directSupers(clazz)) {
+ assertContainsFields(clazz, directSuper);
+ }
+ }
+
+ List<Class<?>> testClasses() {
+ List<Class<?>> testClasses = new ArrayList<>();
+ testClasses.add(Sanity.class);
+ testClasses.addAll(Arrays.asList(Sanity.class.getDeclaredClasses()));
+ assertEquals(testClasses.size(), 10);
+ return testClasses;
+ }
+
+ @Test
+ public void fieldsAreInheritedFromSupers() throws Exception {
+ for (Class clazz : testClasses()) {
+ assertContainsSuperFields(clazz);
+ }
+ }
+
+ @Test
+ public void getFieldIsConsistentWithGetFields() throws Exception {
+ for (Class clazz : testClasses()) {
+ for (Field field : clazz.getFields()) {
+ assertEquals(field, clazz.getField(field.getName()));
+ }
+ }
+ }
+}
--- a/jdk/test/java/lang/reflect/Parameter/BadClassFiles.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/lang/reflect/Parameter/BadClassFiles.java Fri Nov 21 14:58:29 2014 -0800
@@ -81,10 +81,23 @@
0,25,0,0,0,3,0,0,
0,1,-79,0,0,0,1,0,
7,0,0,0,6,0,1,0,
- 0,0,2,0,10,0,0,0,
- 9,2,0,11,0,0,0,12,
- 0,0,0,1,0,13,0,0,
- 0,2,0,14
+ 0,0,2,
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,9,
+ // parameter_count
+ 2,
+ // first parameter name
+ 0,11,
+ // first parameter modifiers
+ 0,0,
+ // second parameter name
+ 0,12,
+ // second parameter modifiers
+ 0,0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
};
private static final byte[] BadModifiers_bytes = {
@@ -121,10 +134,23 @@
25,0,0,0,3,0,0,0,
1,-79,0,0,0,1,0,7,
0,0,0,6,0,1,0,0,
- 0,2,0,10,0,0,0,9,
- 2,0,11,0,51,51,12,0,
- 0,0,1,0,13,0,0,0,
- 2,0,14
+ 0,2,
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,9,
+ // parameter_count
+ 2,
+ // first parameter name
+ 0,11,
+ // first parameter modifiers
+ 51,51,
+ // second parameter name
+ 0,12,
+ // second parameter modifiers
+ 0,0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
};
private static final byte[] BadNameIndex_bytes = {
@@ -161,10 +187,23 @@
25,0,0,0,3,0,0,0,
1,-79,0,0,0,1,0,7,
0,0,0,6,0,1,0,0,
- 0,2,0,10,0,0,0,9,
- 2,0,1,0,0,0,12,0,
- 0,0,1,0,13,0,0,0,
- 2,0,14
+ 0,2,
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,9,
+ // parameter_count
+ 2,
+ // first parameter name
+ 0,1,
+ // first parameter modifiers
+ 0,0,
+ // second parameter name
+ 0,12,
+ // second parameter modifiers
+ 0,0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
};
private static final byte[] NameIndexOutOfBounds_bytes = {
@@ -203,11 +242,23 @@
25,0,0,0,3,0,0,0,
1,-79,0,0,0,1,0,7,
0,0,0,6,0,1,0,0,
- 0,2,0,10,0,0,0,9,
- 2,0,-1,0,0,0,12,0,
- 0,0,1,0,13,0,0,0,
- 2,0,14
-
+ 0,2,
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,9,
+ // parameter_count
+ 2,
+ // first parameter name
+ 0,-1,
+ // first parameter modifiers
+ 0,0,
+ // second parameter name
+ 0,12,
+ // second parameter modifiers
+ 0,0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
};
private static final byte[] ExtraParams_bytes = {
@@ -244,10 +295,26 @@
0,0,3,0,0,0,1,-79,
0,0,0,1,0,7,0,0,
0,6,0,1,0,0,0,2,
- 0,10,0,0,0,13,3,0,
- 11,0,0,0,12,0,0,0,
- 11,0,0,0,1,0,13,0,
- 0,0,2,0,14
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,13,
+ // parameter_count
+ 3,
+ // first parameter name
+ 0,11,
+ // first parameter modifiers
+ 0,0,
+ // second parameter name
+ 0,12,
+ // second parameter modifiers
+ 0,0,
+ // third parameter name
+ 0,11,
+ // third parameter modifiers
+ 0,0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
};
private static final byte[] BadName1_bytes = {
@@ -283,10 +350,23 @@
25,0,0,0,3,0,0,0,
1,-79,0,0,0,1,0,7,
0,0,0,6,0,1,0,0,
- 0,2,0,10,0,0,0,9,
- 2,0,11,0,0,0,12,0,
- 0,0,1,0,13,0,0,0,
- 2,0,14
+ 0,2,
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,9,
+ // parameter_count
+ 2,
+ // first parameter name
+ 0,11,
+ // first parameter modifiers
+ 0,0,
+ // second parameter name
+ 0,12,
+ // second parameter modifiers
+ 0,0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
};
private static final byte[] BadName2_bytes = {
@@ -322,10 +402,23 @@
25,0,0,0,3,0,0,0,
1,-79,0,0,0,1,0,7,
0,0,0,6,0,1,0,0,
- 0,2,0,10,0,0,0,9,
- 2,0,11,0,0,0,12,0,
- 0,0,1,0,13,0,0,0,
- 2,0,14
+ 0,2,
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,9,
+ // parameter_count
+ 2,
+ // first parameter name
+ 0,11,
+ // first parameter modifiers
+ 0,0,
+ // second parameter name
+ 0,12,
+ // second parameter modifiers
+ 0,0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
};
private static final byte[] BadName3_bytes = {
@@ -361,10 +454,23 @@
25,0,0,0,3,0,0,0,
1,-79,0,0,0,1,0,7,
0,0,0,6,0,1,0,0,
- 0,2,0,10,0,0,0,9,
- 2,0,11,0,0,0,12,0,
- 0,0,1,0,13,0,0,0,
- 2,0,14
+ 0,2,
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,9,
+ // parameter_count
+ 2,
+ // first parameter name
+ 0,11,
+ // first parameter modifiers
+ 0,0,
+ // second parameter name
+ 0,12,
+ // second parameter modifiers
+ 0,0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
};
private static final byte[] BadName4_bytes = {
@@ -400,10 +506,68 @@
25,0,0,0,3,0,0,0,
1,-79,0,0,0,1,0,7,
0,0,0,6,0,1,0,0,
- 0,2,0,10,0,0,0,9,
- 2,0,11,0,0,0,12,0,
- 0,0,1,0,13,0,0,0,
- 2,0,14
+ 0,2,
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,9,
+ // parameter_count
+ 2,
+ // first parameter name
+ 0,11,
+ // first parameter modifiers
+ 0,0,
+ // second parameter name
+ 0,12,
+ // second parameter modifiers
+ 0,0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
+ };
+
+ private static final byte[] BadParams_bytes = {
+ -54,-2,-70,-66,0,0,0,
+ 52,0,18,10,0,3,0,15,
+ 7,0,16,7,0,17,1,0,6,
+ 60,105,110,105,116,62,
+ 1,0,3,40,41,86,1,0,4,
+ 67,111,100,101,1,0,15,
+ 76,105,110,101,78,117,
+ 109,98,101,114,84,97,
+ 98,108,101,1,0,1,109,
+ 1,0,5,40,73,73,41,86,
+ 1,0,16,77,101,116,104,
+ 111,100,80,97,114,97,
+ 109,101,116,101,114,115,
+ 1,0,1,97,1,0,1,98,1,
+ 0,10,83,111,117,114,
+ 99,101,70,105,108,101,
+ 1,0,14,66,97,100,80,97,
+ 114,97,109,115,46,106,
+ 97,118,97,12,0,4,0,5,
+ 1,0,9,66,97,100,80,97,
+ 114,97,109,115,1,0,16,
+ 106,97,118,97,47,108,97,
+ 110,103,47,79,98,106,
+ 101,99,116,0,33,0,
+ 2,0,3,0,0,0,0,0,2,
+ 0,1,0,4,0,5,0,1,0,
+ 6,0,0,0,29,0,1,0,1,
+ 0,0,0,5,42,-73,0,1,
+ -79,0,0,0,1,0,7,0,0,
+ 0,6,0,1,0,0,0,1,0,1,
+ 0,8,0,9,0,2,0,6,0,0,
+ 0,25,0,0,0,3,0,0,0,1,
+ -79,0,0,0,1,0,7,0,0,
+ 0,6,0,1,0,0,0,2,
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,1,
+ // parameter_count
+ 0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
};
private static class InMemoryClassLoader extends ClassLoader {
@@ -423,6 +587,7 @@
loader.defineClass("BadNameIndex", BadNameIndex_bytes),
loader.defineClass("NameIndexOutOfBounds", NameIndexOutOfBounds_bytes),
loader.defineClass("ExtraParams", ExtraParams_bytes),
+ loader.defineClass("BadParams", BadParams_bytes),
// Name with .
loader.defineClass("BadName1", BadName1_bytes),
// Name with [
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/reflect/Parameter/NoName.java Fri Nov 21 14:58:29 2014 -0800
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @run main NoName
+ * @summary The reflection API should report parameters with no name properly.
+ */
+import java.lang.Class;
+import java.lang.reflect.Method;
+import java.lang.reflect.Parameter;
+import java.lang.reflect.MalformedParametersException;
+import java.lang.ClassLoader;
+import java.lang.ClassNotFoundException;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class NoName {
+
+ private static final byte[] NoName_bytes = {
+ -54,-2,-70,-66,0,0,0,52,
+ 0,18,10,0,3,0,15,7,
+ 0,16,7,0,17,1,0,6,
+ 60,105,110,105,116,62,1,0,
+ 3,40,41,86,1,0,4,67,
+ 111,100,101,1,0,15,76,105,
+ 110,101,78,117,109,98,101,114,
+ 84,97,98,108,101,1,0,1,
+ 109,1,0,5,40,73,73,41,
+ 86,1,0,16,77,101,116,104,
+ 111,100,80,97,114,97,109,101,
+ 116,101,114,115,1,0,0,1,
+ 0,1,98,1,0,10,83,111,
+ 117,114,99,101,70,105,108,101,
+ 1,0,14,69,109,112,116,121,
+ 78,97,109,101,46,106,97,118,
+ 97,12,0,4,0,5,1,0,
+ 9,69,109,112,116,121,78,97,
+ 109,101,1,0,16,106,97,118,
+ 97,47,108,97,110,103,47,79,
+ 98,106,101,99,116,0,33,0,
+ 2,0,3,0,0,0,0,0,
+ 2,0,1,0,4,0,5,0,
+ 1,0,6,0,0,0,29,0,
+ 1,0,1,0,0,0,5,42,
+ -73,0,1,-79,0,0,0,1,
+ 0,7,0,0,0,6,0,1,
+ 0,0,0,1,0,1,0,8,
+ 0,9,0,2,0,6,0,0,
+ 0,25,0,0,0,3,0,0,
+ 0,1,-79,0,0,0,1,0,
+ 7,0,0,0,6,0,1,0,
+ 0,0,2,
+ // Method Parameters attribute here
+ 0,10,
+ // attribute_length
+ 0,0,0,9,
+ // parameter_count
+ 2,
+ // first parameter name
+ 0,0,
+ // first parameter modifiers
+ 0,0,
+ // second parameter name
+ 0,12,
+ // second parameter modifiers
+ 0,0,
+ // end attribute
+ 0,1,0,13,0,0,0,2,0,14
+ };
+
+ private static class InMemoryClassLoader extends ClassLoader {
+ public Class<?> defineClass(String name, byte[] b) {
+ return defineClass(name, b, 0, b.length);
+ }
+ };
+
+ private static final InMemoryClassLoader loader = new InMemoryClassLoader();
+
+ private final Class<?> noName;
+
+ private NoName() throws ClassNotFoundException {
+ noName = loader.defineClass("EmptyName", NoName_bytes);
+ }
+
+ public static void main(String... args)
+ throws NoSuchMethodException, IOException, ClassNotFoundException {
+ new NoName().run();
+ }
+
+ public void run() throws NoSuchMethodException {
+ final Class<?> cls = noName;
+ System.err.println("Trying " + cls);
+ final Method method = cls.getMethod("m", int.class, int.class);
+ final Parameter[] params = method.getParameters();
+ System.err.println("Name " + params[0].getName());
+ System.err.println("Name " + params[1].getName());
+ }
+
+}
--- a/jdk/test/java/util/Formatter/Basic-X.java.template Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/Basic-X.java.template Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -572,6 +580,14 @@
test("%(10d", " (12345)", negate(oneToFive));
test("%-10d", "12345 ", oneToFive);
test("%-10d", "-12345 ", negate(oneToFive));
+ // , variations:
+ test("% ,d", " 12,345", oneToFive);
+ test("% ,d", "-12,345", negate(oneToFive));
+ test("%0,10d", "000012,345", oneToFive);
+ test("%0,10d", "-00012,345", negate(oneToFive));
+ test("%(,10d", " (12,345)", negate(oneToFive));
+ test("%-,10d", "12,345 ", oneToFive);
+ test("%-,10d", "-12,345 ", negate(oneToFive));
#else[short]
#if[prim]
@@ -594,6 +610,16 @@
test("%(10d", " (1234567)", negate(oneToSeven));
test("%-10d", "1234567 ", oneToSeven);
test("%-10d", "-1234567 ", negate(oneToSeven));
+ // , variations:
+ test("% ,d", " 1,234,567", oneToSeven);
+ test("% ,d", "-1,234,567", negate(oneToSeven));
+ test("%+,10d", "+1,234,567", oneToSeven);
+ test("%0,10d", "01,234,567", oneToSeven);
+ test("%0,10d", "-1,234,567", negate(oneToSeven));
+ test("%(,10d", "(1,234,567)", negate(oneToSeven));
+ test("%-,10d", "1,234,567 ", oneToSeven);
+ test("%-,10d", "-1,234,567", negate(oneToSeven));
+
#end[prim]
#end[short]
#end[byte]
@@ -781,6 +807,14 @@
test("%+d", "-1234567", new BigInteger("-1234567", 10));
test("%-10d", "1234567 ", new BigInteger("1234567", 10));
test("%-10d", "-1234567 ", new BigInteger("-1234567", 10));
+ // , variations:
+ test("%0,10d", "01,234,567", new BigInteger("1234567", 10));
+ test("%0,10d", "-1,234,567", new BigInteger("-1234567", 10));
+ test("%(,10d", "(1,234,567)", new BigInteger("-1234567", 10));
+ test("%+,d", "+1,234,567", new BigInteger("1234567", 10));
+ test("%+,d", "-1,234,567", new BigInteger("-1234567", 10));
+ test("%-,10d", "1,234,567 ", new BigInteger("1234567", 10));
+ test("%-,10d", "-1,234,567", new BigInteger("-1234567", 10));
//---------------------------------------------------------------------
// %o - BigInteger
@@ -1039,6 +1073,14 @@
test("%3.0f", "1000000", 1000000.00);
test("%3.0f", "10000000", 10000000.00);
test("%3.0f", "100000000", 100000000.00);
+ test("%10.0f", " 1000000", 1000000.00);
+ test("%,10.0f", " 1,000,000", 1000000.00);
+ test("%,10.1f", "1,000,000.0", 1000000.00);
+ test("%,3.0f", "1,000,000", 1000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
#if[BigDecimal]
//---------------------------------------------------------------------
// %f - BigDecimal
--- a/jdk/test/java/util/Formatter/BasicBigDecimal.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicBigDecimal.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -831,6 +839,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %s - BigDecimal
//---------------------------------------------------------------------
@@ -1039,6 +1073,14 @@
test("%3.0f", "1000000", 1000000.00);
test("%3.0f", "10000000", 10000000.00);
test("%3.0f", "100000000", 100000000.00);
+ test("%10.0f", " 1000000", 1000000.00);
+ test("%,10.0f", " 1,000,000", 1000000.00);
+ test("%,10.1f", "1,000,000.0", 1000000.00);
+ test("%,3.0f", "1,000,000", 1000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
//---------------------------------------------------------------------
// %f - BigDecimal
@@ -1351,6 +1393,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %f, %e, %g, %a - Boundaries
//---------------------------------------------------------------------
--- a/jdk/test/java/util/Formatter/BasicBigInteger.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicBigInteger.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -754,6 +762,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// BigInteger - errors
//---------------------------------------------------------------------
@@ -781,6 +807,14 @@
test("%+d", "-1234567", new BigInteger("-1234567", 10));
test("%-10d", "1234567 ", new BigInteger("1234567", 10));
test("%-10d", "-1234567 ", new BigInteger("-1234567", 10));
+ // , variations:
+ test("%0,10d", "01,234,567", new BigInteger("1234567", 10));
+ test("%0,10d", "-1,234,567", new BigInteger("-1234567", 10));
+ test("%(,10d", "(1,234,567)", new BigInteger("-1234567", 10));
+ test("%+,d", "+1,234,567", new BigInteger("1234567", 10));
+ test("%+,d", "-1,234,567", new BigInteger("-1234567", 10));
+ test("%-,10d", "1,234,567 ", new BigInteger("1234567", 10));
+ test("%-,10d", "-1,234,567", new BigInteger("-1234567", 10));
//---------------------------------------------------------------------
// %o - BigInteger
@@ -1573,6 +1607,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicBoolean.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicBoolean.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -1573,6 +1581,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicBooleanObject.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicBooleanObject.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -1573,6 +1581,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicByte.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicByte.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -597,6 +605,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %d - errors
//---------------------------------------------------------------------
@@ -1573,6 +1599,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicByteObject.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicByteObject.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -597,6 +605,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %d - errors
//---------------------------------------------------------------------
@@ -1573,6 +1599,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicChar.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicChar.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -1573,6 +1581,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicCharObject.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicCharObject.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -1573,6 +1581,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicDateTime.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicDateTime.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -1573,6 +1581,85 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicDouble.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicDouble.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,6 +36,9 @@
import java.text.DateFormatSymbols;
import java.util.*;
+import sun.misc.DoubleConsts;
+
+
import static java.util.Calendar.*;
@@ -48,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -55,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -859,6 +870,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %s - double
//---------------------------------------------------------------------
@@ -1036,6 +1073,14 @@
test("%3.0f", "1000000", 1000000.00);
test("%3.0f", "10000000", 10000000.00);
test("%3.0f", "100000000", 100000000.00);
+ test("%10.0f", " 1000000", 1000000.00);
+ test("%,10.0f", " 1,000,000", 1000000.00);
+ test("%,10.1f", "1,000,000.0", 1000000.00);
+ test("%,3.0f", "1,000,000", 1000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
@@ -1310,12 +1355,12 @@
test("%.1a", "-0x1.0p0", -1.0);
test("%.11a", "0x1.80000000000p1", 3.0);
test("%.1a", "0x1.8p1", 3.0);
- test("%.11a", "0x1.00000000000p-1022", Double.MIN_NORMAL);
- test("%.1a", "0x1.0p-1022", Double.MIN_NORMAL);
+ test("%.11a", "0x1.00000000000p-1022", DoubleConsts.MIN_NORMAL);
+ test("%.1a", "0x1.0p-1022", DoubleConsts.MIN_NORMAL);
test("%.11a", "0x1.00000000000p-1022",
- Math.nextDown(Double.MIN_NORMAL));
+ Math.nextDown(DoubleConsts.MIN_NORMAL));
test("%.1a", "0x1.0p-1022",
- Math.nextDown(Double.MIN_NORMAL));
+ Math.nextDown(DoubleConsts.MIN_NORMAL));
test("%.11a", "0x1.ffffffffffep-1023", 0x0.fffffffffffp-1022);
test("%.1a", "0x1.0p-1022", 0x0.fffffffffffp-1022);
test("%.30a", "0x0.000000000000100000000000000000p-1022", Double.MIN_VALUE);
--- a/jdk/test/java/util/Formatter/BasicDoubleObject.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicDoubleObject.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -872,6 +880,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %s - Double
//---------------------------------------------------------------------
@@ -1039,6 +1073,14 @@
test("%3.0f", "1000000", 1000000.00);
test("%3.0f", "10000000", 10000000.00);
test("%3.0f", "100000000", 100000000.00);
+ test("%10.0f", " 1000000", 1000000.00);
+ test("%,10.0f", " 1,000,000", 1000000.00);
+ test("%,10.1f", "1,000,000.0", 1000000.00);
+ test("%,3.0f", "1,000,000", 1000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
@@ -1351,6 +1393,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %f, %e, %g, %a - Boundaries
//---------------------------------------------------------------------
--- a/jdk/test/java/util/Formatter/BasicFloat.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicFloat.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -842,6 +850,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %s - float
//---------------------------------------------------------------------
@@ -1039,6 +1073,14 @@
test("%3.0f", "1000000", 1000000.00);
test("%3.0f", "10000000", 10000000.00);
test("%3.0f", "100000000", 100000000.00);
+ test("%10.0f", " 1000000", 1000000.00);
+ test("%,10.0f", " 1,000,000", 1000000.00);
+ test("%,10.1f", "1,000,000.0", 1000000.00);
+ test("%,3.0f", "1,000,000", 1000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
@@ -1351,6 +1393,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %f, %e, %g, %a - Boundaries
//---------------------------------------------------------------------
--- a/jdk/test/java/util/Formatter/BasicFloatObject.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicFloatObject.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -852,6 +860,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %s - Float
//---------------------------------------------------------------------
@@ -1039,6 +1073,14 @@
test("%3.0f", "1000000", 1000000.00);
test("%3.0f", "10000000", 10000000.00);
test("%3.0f", "100000000", 100000000.00);
+ test("%10.0f", " 1000000", 1000000.00);
+ test("%,10.0f", " 1,000,000", 1000000.00);
+ test("%,10.1f", "1,000,000.0", 1000000.00);
+ test("%,3.0f", "1,000,000", 1000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
+ test("%,3.0f", "10,000,000", 10000000.00);
+ test("%,3.0f", "100,000,000", 100000000.00);
@@ -1351,6 +1393,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %f, %e, %g, %a - Boundaries
//---------------------------------------------------------------------
--- a/jdk/test/java/util/Formatter/BasicInt.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicInt.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -575,6 +583,14 @@
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %d - int and long
//---------------------------------------------------------------------
@@ -594,6 +610,16 @@
test("%(10d", " (1234567)", negate(oneToSeven));
test("%-10d", "1234567 ", oneToSeven);
test("%-10d", "-1234567 ", negate(oneToSeven));
+ // , variations:
+ test("% ,d", " 1,234,567", oneToSeven);
+ test("% ,d", "-1,234,567", negate(oneToSeven));
+ test("%+,10d", "+1,234,567", oneToSeven);
+ test("%0,10d", "01,234,567", oneToSeven);
+ test("%0,10d", "-1,234,567", negate(oneToSeven));
+ test("%(,10d", "(1,234,567)", negate(oneToSeven));
+ test("%-,10d", "1,234,567 ", oneToSeven);
+ test("%-,10d", "-1,234,567", negate(oneToSeven));
+
@@ -1573,6 +1599,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicIntObject.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicIntObject.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -597,6 +605,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %d - errors
//---------------------------------------------------------------------
@@ -1573,6 +1599,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicLong.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicLong.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -575,6 +583,14 @@
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %d - int and long
//---------------------------------------------------------------------
@@ -594,6 +610,16 @@
test("%(10d", " (1234567)", negate(oneToSeven));
test("%-10d", "1234567 ", oneToSeven);
test("%-10d", "-1234567 ", negate(oneToSeven));
+ // , variations:
+ test("% ,d", " 1,234,567", oneToSeven);
+ test("% ,d", "-1,234,567", negate(oneToSeven));
+ test("%+,10d", "+1,234,567", oneToSeven);
+ test("%0,10d", "01,234,567", oneToSeven);
+ test("%0,10d", "-1,234,567", negate(oneToSeven));
+ test("%(,10d", "(1,234,567)", negate(oneToSeven));
+ test("%-,10d", "1,234,567 ", oneToSeven);
+ test("%-,10d", "-1,234,567", negate(oneToSeven));
+
@@ -1573,6 +1599,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicLongObject.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicLongObject.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -597,6 +605,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %d - errors
//---------------------------------------------------------------------
@@ -1573,6 +1599,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicShort.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicShort.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -572,6 +580,24 @@
test("%(10d", " (12345)", negate(oneToFive));
test("%-10d", "12345 ", oneToFive);
test("%-10d", "-12345 ", negate(oneToFive));
+ // , variations:
+ test("% ,d", " 12,345", oneToFive);
+ test("% ,d", "-12,345", negate(oneToFive));
+ test("%0,10d", "000012,345", oneToFive);
+ test("%0,10d", "-00012,345", negate(oneToFive));
+ test("%(,10d", " (12,345)", negate(oneToFive));
+ test("%-,10d", "12,345 ", oneToFive);
+ test("%-,10d", "-12,345 ", negate(oneToFive));
+
+
+
+
+
+
+
+
+
+
@@ -1573,6 +1599,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/BasicShortObject.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/BasicShortObject.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -51,6 +51,10 @@
Formatter f = new Formatter(new StringBuilder(), Locale.US);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), Locale.US);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(Locale l, String fs, String exp, Object ... args)
@@ -58,6 +62,10 @@
Formatter f = new Formatter(new StringBuilder(), l);
f.format(fs, args);
ck(fs, exp, f.toString());
+
+ f = new Formatter(new StringBuilder(), l);
+ f.format("foo " + fs + " bar", args);
+ ck(fs, "foo " + exp + " bar", f.toString());
}
private static void test(String fs, Object ... args) {
@@ -597,6 +605,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %d - errors
//---------------------------------------------------------------------
@@ -1573,6 +1599,67 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
//---------------------------------------------------------------------
// %t
//
--- a/jdk/test/java/util/Formatter/genBasic.sh Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Formatter/genBasic.sh Fri Nov 21 14:58:29 2014 -0800
@@ -23,7 +23,7 @@
# questions.
#
-javac -d . ../../../../make/tools/src/build/tools/spp/Spp.java
+javac -d . ../../../../make/src/classes/build/tools/spp/Spp.java
gen() {
# if [ $3 = "true" ]
--- a/jdk/test/java/util/Timer/NameConstructors.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/java/util/Timer/NameConstructors.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -23,37 +23,42 @@
/*
* @test
- * @bug 4279061
+ * @bug 4279061 8056313
* @summary Basic test for constructors with thread name
*/
-import java.util.*;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.LinkedTransferQueue;
public class NameConstructors {
private static final String NAME1 = "Norm D. Plume";
private static final String NAME2 = "Ann Onymous";
- public static void main (String[] args) throws Exception {
- Random rnd = new Random();
+ public static void main (String[] args) throws InterruptedException {
test(new Timer(NAME1), NAME1);
test(new Timer(NAME2, true), NAME2);
}
- private static boolean done, passed;
+ public static void test(Timer timer, String expected) throws InterruptedException {
+ try {
+ LinkedTransferQueue<String> queue = new LinkedTransferQueue<>();
- public static void test(Timer timer, final String name) throws Exception {
- done = passed = false;
+ TimerTask task = new TimerTask() {
+ public void run() {
+ queue.put(Thread.currentThread().getName());
+ }
+ };
- TimerTask task = new TimerTask() {
- public void run() {
- passed = Thread.currentThread().getName().equals(name);
- done = true;
+ timer.schedule(task, 0L); // immediately
+ String actual = queue.take();
+
+ if (!expected.equals(actual)) {
+ throw new AssertionError(
+ String.format("expected='%s', actual='%s'", expected, actual));
}
- };
- timer.schedule(task, 0); // Immediate
- Thread.sleep(500);
- if (!(done && passed))
- throw new RuntimeException(done + " : " + passed);
- timer.cancel();
+ } finally {
+ timer.cancel();
+ }
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/jar/Attributes/IterationOrder.java Fri Nov 21 14:58:29 2014 -0800
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2014 Google, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ * @bug 8062194
+ * @summary Ensure Attribute iteration order is the insertion order.
+ */
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.Attributes.Name;
+
+public class IterationOrder {
+ static void checkOrder(Attributes.Name k0, String v0,
+ Attributes.Name k1, String v1,
+ Attributes.Name k2, String v2) {
+ Attributes x = new Attributes();
+ x.put(k0, v0);
+ x.put(k1, v1);
+ x.put(k2, v2);
+ Map.Entry<?,?>[] entries
+ = x.entrySet().toArray(new Map.Entry<?,?>[3]);
+ if (!(entries.length == 3
+ && entries[0].getKey() == k0
+ && entries[0].getValue() == v0
+ && entries[1].getKey() == k1
+ && entries[1].getValue() == v1
+ && entries[2].getKey() == k2
+ && entries[2].getValue() == v2)) {
+ throw new AssertionError(Arrays.toString(entries));
+ }
+
+ Object[] keys = x.keySet().toArray();
+ if (!(keys.length == 3
+ && keys[0] == k0
+ && keys[1] == k1
+ && keys[2] == k2)) {
+ throw new AssertionError(Arrays.toString(keys));
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ Attributes.Name k0 = Name.MANIFEST_VERSION;
+ Attributes.Name k1 = Name.MAIN_CLASS;
+ Attributes.Name k2 = Name.SEALED;
+ String v0 = "42.0";
+ String v1 = "com.google.Hello";
+ String v2 = "yes";
+ checkOrder(k0, v0, k1, v1, k2, v2);
+ checkOrder(k1, v1, k0, v0, k2, v2);
+ checkOrder(k2, v2, k1, v1, k0, v0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/zip/ChecksumBase.java Fri Nov 21 14:58:29 2014 -0800
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * Base class for Checksum tests
+ */
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
+import java.util.zip.Checksum;
+
+public class ChecksumBase {
+
+ private final static byte[] BYTES_123456789 = "123456789".getBytes(StandardCharsets.US_ASCII);
+
+ public static void testAll(Checksum checksum, long expected) {
+ testBytes(checksum, expected);
+ testByteArray(checksum, expected);
+ testWrappedByteBuffer(checksum, expected);
+ testReadonlyByteBuffer(checksum, expected);
+ testDirectByteBuffer(checksum, expected);
+ testByteArrayOffset(checksum, expected);
+ testDirectByteBufferOffset(checksum, expected);
+ testLittleEndianDirectByteBufferOffset(checksum, expected);
+ testWrappedByteBufferOffset(checksum, expected);
+ testLittleEndianWrappedByteBufferOffset(checksum, expected);
+ testReadonlyByteBufferOffset(checksum, expected);
+ testLittleEndianReadonlyByteBufferOffset(checksum, expected);
+ }
+
+ private static void testBytes(Checksum checksum, long expected) {
+ checksum.reset();
+ for (byte bits : BYTES_123456789) {
+ checksum.update(bits);
+ }
+ checkChecksum(checksum, expected);
+ }
+
+ private static void testByteArray(Checksum checksum, long expected) {
+ checksum.reset();
+ checksum.update(BYTES_123456789);
+ checkChecksum(checksum, expected);
+ }
+
+ private static void testWrappedByteBuffer(Checksum checksum, long expected) {
+ checksum.reset();
+ ByteBuffer bb = ByteBuffer.wrap(BYTES_123456789);
+ checksum.update(bb);
+ checkChecksum(checksum, expected);
+ }
+
+ private static void testReadonlyByteBuffer(Checksum checksum, long expected) {
+ checksum.reset();
+ ByteBuffer bb = ByteBuffer.wrap(BYTES_123456789).asReadOnlyBuffer();
+ checksum.update(bb);
+ checkChecksum(checksum, expected);
+ }
+
+ private static void testDirectByteBuffer(Checksum checksum, long expected) {
+ checksum.reset();
+ ByteBuffer bb = ByteBuffer.allocateDirect(BYTES_123456789.length);
+ bb.put(BYTES_123456789);
+ bb.rewind();
+ checksum.update(bb);
+ checkChecksum(checksum, expected);
+ }
+
+ private static void checkChecksum(Checksum checksum, long expected) {
+ if (checksum.getValue() != expected) {
+ throw new RuntimeException("Calculated checksum result was invalid."
+ + " Expected " + Long.toHexString(expected)
+ + ", but got " + Long.toHexString(checksum.getValue()) + ".");
+ }
+ }
+
+ private static void testByteArrayOffset(Checksum checksum, long expected) {
+ byte[] unaligned_bytes_123456789 = new byte[BYTES_123456789.length + 64];
+ for (int i = 0; i < unaligned_bytes_123456789.length - BYTES_123456789.length; i++) {
+ checksum.reset();
+ System.arraycopy(BYTES_123456789, 0, unaligned_bytes_123456789, i, BYTES_123456789.length);
+ checksum.update(unaligned_bytes_123456789, i, BYTES_123456789.length);
+ checkChecksumOffset(checksum, expected, i);
+ }
+ }
+
+ private static void testDirectByteBufferOffset(Checksum checksum, long expected) {
+ byte[] unaligned_bytes_123456789 = new byte[BYTES_123456789.length + 64];
+ for (int i = 0; i < unaligned_bytes_123456789.length - BYTES_123456789.length; i++) {
+ checksum.reset();
+ ByteBuffer bb = ByteBuffer.allocateDirect(unaligned_bytes_123456789.length);
+ System.arraycopy(BYTES_123456789, 0, unaligned_bytes_123456789, i, BYTES_123456789.length);
+ bb.put(unaligned_bytes_123456789);
+ bb.position(i);
+ bb.limit(i + BYTES_123456789.length);
+ checksum.update(bb);
+ checkChecksumOffset(checksum, expected, i);
+ }
+ }
+
+ private static void testLittleEndianDirectByteBufferOffset(Checksum checksum, long expected) {
+ byte[] unaligned_bytes_123456789 = new byte[BYTES_123456789.length + 64];
+ for (int i = 0; i < unaligned_bytes_123456789.length - BYTES_123456789.length; i++) {
+ checksum.reset();
+ ByteBuffer bb = ByteBuffer.allocateDirect(unaligned_bytes_123456789.length);
+ bb.order(ByteOrder.LITTLE_ENDIAN);
+ System.arraycopy(BYTES_123456789, 0, unaligned_bytes_123456789, i, BYTES_123456789.length);
+ bb.put(unaligned_bytes_123456789);
+ bb.position(i);
+ bb.limit(i + BYTES_123456789.length);
+ checksum.update(bb);
+ checkChecksumOffset(checksum, expected, i);
+ }
+ }
+
+ private static void testWrappedByteBufferOffset(Checksum checksum, long expected) {
+ byte[] unaligned_bytes_123456789 = new byte[BYTES_123456789.length + 64];
+ for (int i = 0; i < unaligned_bytes_123456789.length - BYTES_123456789.length; i++) {
+ checksum.reset();
+ System.arraycopy(BYTES_123456789, 0, unaligned_bytes_123456789, i, BYTES_123456789.length);
+ ByteBuffer bb = ByteBuffer.wrap(unaligned_bytes_123456789);
+ bb.position(i);
+ bb.limit(i + BYTES_123456789.length);
+ checksum.update(bb);
+ checkChecksumOffset(checksum, expected, i);
+ }
+ }
+
+ private static void testLittleEndianWrappedByteBufferOffset(Checksum checksum, long expected) {
+ byte[] unaligned_bytes_123456789 = new byte[BYTES_123456789.length + 64];
+ for (int i = 0; i < unaligned_bytes_123456789.length - BYTES_123456789.length; i++) {
+ checksum.reset();
+ System.arraycopy(BYTES_123456789, 0, unaligned_bytes_123456789, i, BYTES_123456789.length);
+ ByteBuffer bb = ByteBuffer.wrap(unaligned_bytes_123456789);
+ bb.order(ByteOrder.LITTLE_ENDIAN);
+ bb.position(i);
+ bb.limit(i + BYTES_123456789.length);
+ checksum.update(bb);
+ checkChecksumOffset(checksum, expected, i);
+ }
+ }
+
+ private static void testReadonlyByteBufferOffset(Checksum checksum, long expected) {
+ byte[] unaligned_bytes_123456789 = new byte[BYTES_123456789.length + 64];
+ for (int i = 0; i < unaligned_bytes_123456789.length - BYTES_123456789.length; i++) {
+ checksum.reset();
+ System.arraycopy(BYTES_123456789, 0, unaligned_bytes_123456789, i, BYTES_123456789.length);
+ ByteBuffer bb = ByteBuffer.wrap(unaligned_bytes_123456789).asReadOnlyBuffer();
+ bb.position(i);
+ bb.limit(i + BYTES_123456789.length);
+ checksum.update(bb);
+ checkChecksumOffset(checksum, expected, i);
+ }
+ }
+
+ private static void testLittleEndianReadonlyByteBufferOffset(Checksum checksum, long expected) {
+ byte[] unaligned_bytes_123456789 = new byte[BYTES_123456789.length + 64];
+ for (int i = 0; i < unaligned_bytes_123456789.length - BYTES_123456789.length; i++) {
+ checksum.reset();
+ System.arraycopy(BYTES_123456789, 0, unaligned_bytes_123456789, i, BYTES_123456789.length);
+ ByteBuffer bb = ByteBuffer.wrap(unaligned_bytes_123456789).asReadOnlyBuffer();
+ bb.order(ByteOrder.LITTLE_ENDIAN);
+ bb.position(i);
+ bb.limit(i + BYTES_123456789.length);
+ checksum.update(bb);
+ checkChecksumOffset(checksum, expected, i);
+ }
+ }
+
+ private static void checkChecksumOffset(Checksum checksum, long expected, int offset) {
+ if (checksum.getValue() != expected) {
+ throw new RuntimeException("Calculated CRC32C result was invalid. Array offset "
+ + offset + ". Expected: " + Long.toHexString(expected) + ", Got: "
+ + Long.toHexString(checksum.getValue()));
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/zip/TestCRC32.java Fri Nov 21 14:58:29 2014 -0800
@@ -0,0 +1,40 @@
+
+import java.util.zip.CRC32;
+
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test @summary Check that CRC-32 returns the expected CRC value for the
+ * string 123456789
+ * http://reveng.sourceforge.net/crc-catalogue/all.htm#crc.cat.crc-32
+ * @build ChecksumBase
+ * @run main TestCRC32
+ */
+
+public class TestCRC32 {
+
+ public static void main(String[] args) {
+ ChecksumBase.testAll(new CRC32(), 0xCBF43926L);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/zip/TestCRC32C.java Fri Nov 21 14:58:29 2014 -0800
@@ -0,0 +1,40 @@
+
+import java.util.zip.CRC32C;
+
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test @summary Check that CRC-32C returns the expected CRC value for the
+ * string 123456789
+ * http://reveng.sourceforge.net/crc-catalogue/all.htm#crc.cat.crc-32c
+ * @build ChecksumBase
+ * @run main TestCRC32C
+ */
+
+public class TestCRC32C {
+
+ public static void main(String[] args) {
+ ChecksumBase.testAll(new CRC32C(), 0xE3069283L);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/util/zip/TestChecksum.java Fri Nov 21 14:58:29 2014 -0800
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test @summary Test that default methods in Checksum works as expected
+ * @build ChecksumBase
+ * @run main TestChecksum
+ */
+import java.util.zip.CRC32C;
+import java.util.zip.Checksum;
+
+public class TestChecksum {
+
+ public static void main(String[] args) {
+ ChecksumBase.testAll(new MyCRC32C(), 0xE3069283L);
+ }
+
+ /**
+ * Only implementing required methods
+ */
+ private static class MyCRC32C implements Checksum {
+
+ private final CRC32C crc32c = new CRC32C();
+
+ @Override
+ public void update(int b) {
+ crc32c.update(b);
+ }
+
+ @Override
+ public void update(byte[] b, int off, int len) {
+ crc32c.update(b, off, len);
+ }
+
+ @Override
+ public long getValue() {
+ return crc32c.getValue();
+ }
+
+ @Override
+ public void reset() {
+ crc32c.reset();
+ }
+
+ }
+}
--- a/jdk/test/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/javax/net/ssl/sanity/ciphersuites/CipherSuitesInOrder.java Fri Nov 21 14:58:29 2014 -0800
@@ -85,11 +85,6 @@
"TLS_ECDH_RSA_WITH_AES_128_CBC_SHA",
"TLS_DHE_RSA_WITH_AES_128_CBC_SHA",
"TLS_DHE_DSS_WITH_AES_128_CBC_SHA",
- "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
- "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
- "SSL_RSA_WITH_RC4_128_SHA",
- "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
- "TLS_ECDH_RSA_WITH_RC4_128_SHA",
"TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA",
"TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA",
@@ -98,6 +93,12 @@
"TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA",
"SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA",
"SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA",
+
+ "TLS_ECDHE_ECDSA_WITH_RC4_128_SHA",
+ "TLS_ECDHE_RSA_WITH_RC4_128_SHA",
+ "SSL_RSA_WITH_RC4_128_SHA",
+ "TLS_ECDH_ECDSA_WITH_RC4_128_SHA",
+ "TLS_ECDH_RSA_WITH_RC4_128_SHA",
"SSL_RSA_WITH_RC4_128_MD5",
"TLS_EMPTY_RENEGOTIATION_INFO_SCSV",
@@ -111,10 +112,23 @@
"TLS_DH_anon_WITH_AES_128_CBC_SHA256",
"TLS_ECDH_anon_WITH_AES_128_CBC_SHA",
"TLS_DH_anon_WITH_AES_128_CBC_SHA",
+ "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
+ "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
"TLS_ECDH_anon_WITH_RC4_128_SHA",
"SSL_DH_anon_WITH_RC4_128_MD5",
- "TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA",
- "SSL_DH_anon_WITH_3DES_EDE_CBC_SHA",
+
+ "SSL_RSA_WITH_DES_CBC_SHA",
+ "SSL_DHE_RSA_WITH_DES_CBC_SHA",
+ "SSL_DHE_DSS_WITH_DES_CBC_SHA",
+ "SSL_DH_anon_WITH_DES_CBC_SHA",
+ "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
+ "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
+ "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
+ "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
+
+ "SSL_RSA_EXPORT_WITH_RC4_40_MD5",
+ "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5",
+
"TLS_RSA_WITH_NULL_SHA256",
"TLS_ECDHE_ECDSA_WITH_NULL_SHA",
"TLS_ECDHE_RSA_WITH_NULL_SHA",
@@ -123,26 +137,17 @@
"TLS_ECDH_RSA_WITH_NULL_SHA",
"TLS_ECDH_anon_WITH_NULL_SHA",
"SSL_RSA_WITH_NULL_MD5",
- "SSL_RSA_WITH_DES_CBC_SHA",
- "SSL_DHE_RSA_WITH_DES_CBC_SHA",
- "SSL_DHE_DSS_WITH_DES_CBC_SHA",
- "SSL_DH_anon_WITH_DES_CBC_SHA",
- "SSL_RSA_EXPORT_WITH_RC4_40_MD5",
- "SSL_DH_anon_EXPORT_WITH_RC4_40_MD5",
- "SSL_RSA_EXPORT_WITH_DES40_CBC_SHA",
- "SSL_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA",
- "SSL_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA",
- "SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA",
+
+ "TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
+ "TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
"TLS_KRB5_WITH_RC4_128_SHA",
"TLS_KRB5_WITH_RC4_128_MD5",
- "TLS_KRB5_WITH_3DES_EDE_CBC_SHA",
- "TLS_KRB5_WITH_3DES_EDE_CBC_MD5",
"TLS_KRB5_WITH_DES_CBC_SHA",
"TLS_KRB5_WITH_DES_CBC_MD5",
+ "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
+ "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5",
"TLS_KRB5_EXPORT_WITH_RC4_40_SHA",
- "TLS_KRB5_EXPORT_WITH_RC4_40_MD5",
- "TLS_KRB5_EXPORT_WITH_DES_CBC_40_SHA",
- "TLS_KRB5_EXPORT_WITH_DES_CBC_40_MD5"
+ "TLS_KRB5_EXPORT_WITH_RC4_40_MD5"
);
private final static String[] protocols = {
--- a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java Fri Nov 21 14:58:29 2014 -0800
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 4635230 6283345 6303830 6824440 6867348 7094155 8038184 8038349
+ * @bug 4635230 6283345 6303830 6824440 6867348 7094155 8038184 8038349 8046949
* @summary Basic unit tests for generating XML Signatures with JSR 105
* @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java
* X509KeySelector.java GenerationTests.java
@@ -377,7 +377,7 @@
static void test_create_signature_x509_crt_crl() throws Exception {
System.out.println("* Generating signature-x509-crt-crl.xml");
- List<Object> xds = new ArrayList<Object>();
+ List<Object> xds = new ArrayList<>();
CertificateFactory cf = CertificateFactory.getInstance("X.509");
xds.add(signingCert);
FileInputStream fis = new FileInputStream(CRL);
@@ -444,7 +444,7 @@
SignedInfo si = fac.newSignedInfo(withoutComments, rsaSha1, refs);
// create objects
- List<XMLStructure> objs = new ArrayList<XMLStructure>();
+ List<XMLObject> objs = new ArrayList<>();
// Object 1
List<Reference> manRefs = Collections.singletonList
@@ -559,7 +559,7 @@
System.out.println("* Generating signature.xml");
// create references
- List<Reference> refs = new ArrayList<Reference>();
+ List<Reference> refs = new ArrayList<>();
// Reference 1
refs.add(fac.newReference(STYLESHEET, sha1));
@@ -610,7 +610,7 @@
SignatureProperties.TYPE, null));
// Reference 8
- List<Transform> transforms = new ArrayList<Transform>();
+ List<Transform> transforms = new ArrayList<>();
transforms.add(fac.newTransform
(Transform.ENVELOPED, (TransformParameterSpec) null));
refs.add(fac.newReference("", sha1, transforms, null, null));
@@ -685,7 +685,7 @@
Document doc = db.newDocument();
// create objects
- List<XMLStructure> objs = new ArrayList<XMLStructure>();
+ List<XMLObject> objs = new ArrayList<>();
// Object 1
objs.add(fac.newXMLObject(Collections.singletonList
@@ -705,7 +705,7 @@
(new DOMStructure(nc)), "object-3", null, null));
// Manifest
- List<Reference> manRefs = new ArrayList<Reference>();
+ List<Reference> manRefs = new ArrayList<>();
// Manifest Reference 1
manRefs.add(fac.newReference(STYLESHEET,
@@ -715,7 +715,7 @@
manRefs.add(fac.newReference("#reference-1", sha1));
// Manifest Reference 3
- List<Transform> manTrans = new ArrayList<Transform>();
+ List<Transform> manTrans = new ArrayList<>();
String xslt = ""
+ "<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform'\n"
+ " xmlns='http://www.w3.org/TR/xhtml1/strict' \n"
@@ -770,7 +770,7 @@
null, null));
// Object 4
- List<Object> xds = new ArrayList<Object>();
+ List<Object> xds = new ArrayList<>();
xds.add("CN=User");
xds.add(kifac.newX509IssuerSerial
("CN=User", new BigInteger("45ef2729", 16)));
@@ -930,7 +930,7 @@
static void test_create_exc_signature() throws Exception {
System.out.println("* Generating exc_signature.xml");
- List<Reference> refs = new ArrayList<Reference>(4);
+ List<Reference> refs = new ArrayList<>(4);
// create reference 1
refs.add(fac.newReference
@@ -942,7 +942,7 @@
null, null));
// create reference 2
- List<String> prefixList = new ArrayList<String>(2);
+ List<String> prefixList = new ArrayList<>(2);
prefixList.add("bar");
prefixList.add("#default");
ExcC14NParameterSpec params = new ExcC14NParameterSpec(prefixList);
@@ -963,7 +963,7 @@
null, null));
// create reference 4
- prefixList = new ArrayList<String>(2);
+ prefixList = new ArrayList<>(2);
prefixList.add("bar");
prefixList.add("#default");
params = new ExcC14NParameterSpec(prefixList);
@@ -982,7 +982,7 @@
fac.newSignatureMethod(SignatureMethod.DSA_SHA1, null), refs);
// create KeyInfo
- List<XMLStructure> kits = new ArrayList<XMLStructure>(2);
+ List<XMLStructure> kits = new ArrayList<>(2);
kits.add(kifac.newKeyValue(validatingKey));
KeyInfo ki = kifac.newKeyInfo(kits);
@@ -1027,10 +1027,10 @@
static void test_create_sign_spec() throws Exception {
System.out.println("* Generating sign-spec.xml");
- List<Reference> refs = new ArrayList<Reference>(2);
+ List<Reference> refs = new ArrayList<>(2);
// create reference 1
- List<XPathType> types = new ArrayList<XPathType>(3);
+ List<XPathType> types = new ArrayList<>(3);
types.add(new XPathType(" //ToBeSigned ", XPathType.Filter.INTERSECT));
types.add(new XPathType(" //NotToBeSigned ",
XPathType.Filter.SUBTRACT));
@@ -1043,7 +1043,7 @@
null, null));
// create reference 2
- List<Transform> trans2 = new ArrayList<Transform>(2);
+ List<Transform> trans2 = new ArrayList<>(2);
trans2.add(fac.newTransform(Transform.ENVELOPED,
(TransformParameterSpec) null));
XPathFilter2ParameterSpec xp2 = new XPathFilter2ParameterSpec
@@ -1061,9 +1061,9 @@
fac.newSignatureMethod(SignatureMethod.DSA_SHA1, null), refs);
// create KeyInfo
- List<XMLStructure> kits = new ArrayList<XMLStructure>(2);
+ List<XMLStructure> kits = new ArrayList<>(2);
kits.add(kifac.newKeyValue(validatingKey));
- List<Object> xds = new ArrayList<Object>(2);
+ List<Object> xds = new ArrayList<>(2);
xds.add("CN=User");
xds.add(signingCert);
kits.add(kifac.newX509Data(xds));
--- a/jdk/test/javax/xml/crypto/dsig/KeySelectors.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/javax/xml/crypto/dsig/KeySelectors.java Fri Nov 21 14:58:29 2014 -0800
@@ -101,9 +101,7 @@
throw new KeySelectorException("Null KeyInfo object!");
}
// search for X509Data in keyinfo
- Iterator iter = keyInfo.getContent().iterator();
- while (iter.hasNext()) {
- XMLStructure kiType = (XMLStructure) iter.next();
+ for (XMLStructure kiType : keyInfo.getContent()) {
if (kiType instanceof X509Data) {
X509Data xd = (X509Data) kiType;
Object[] entries = xd.getContent().toArray();
@@ -114,10 +112,8 @@
crl = (X509CRL) entries[i];
}
}
- Iterator xi = xd.getContent().iterator();
boolean hasCRL = false;
- while (xi.hasNext()) {
- Object o = xi.next();
+ for (Object o : xd.getContent()) {
// skip non-X509Certificate entries
if (o instanceof X509Certificate) {
if ((purpose != KeySelector.Purpose.VERIFY) &&
@@ -152,10 +148,8 @@
throw new KeySelectorException("Null KeyInfo object!");
}
SignatureMethod sm = (SignatureMethod) method;
- List list = keyInfo.getContent();
- for (int i = 0; i < list.size(); i++) {
- XMLStructure xmlStructure = (XMLStructure) list.get(i);
+ for (XMLStructure xmlStructure : keyInfo.getContent()) {
if (xmlStructure instanceof KeyValue) {
PublicKey pk = null;
try {
@@ -282,9 +276,7 @@
if (keyInfo == null) {
throw new KeySelectorException("Null KeyInfo object!");
}
- Iterator iter = keyInfo.getContent().iterator();
- while (iter.hasNext()) {
- XMLStructure xmlStructure = (XMLStructure) iter.next();
+ for (XMLStructure xmlStructure : keyInfo.getContent()) {
try {
if (xmlStructure instanceof KeyName) {
String name = ((KeyName)xmlStructure).getName();
@@ -330,14 +322,12 @@
}
} else if (xmlStructure instanceof X509Data) {
List content = ((X509Data)xmlStructure).getContent();
- int size = content.size();
Vector<X509Certificate> result = null;
// Lookup the public key using the information
// specified in X509Data element, i.e. searching
// over the collection of certificate files under
// "certs" subdirectory and return those match.
- for (int k = 0; k<size; k++) {
- Object obj = content.get(k);
+ for (Object obj : content) {
if (obj instanceof String) {
result = match(MATCH_SUBJECT, obj, certs);
} else if (obj instanceof byte[]) {
--- a/jdk/test/javax/xml/crypto/dsig/SignatureValidator.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/javax/xml/crypto/dsig/SignatureValidator.java Fri Nov 21 14:58:29 2014 -0800
@@ -78,9 +78,10 @@
// Check reference cache
if (cache) {
- Iterator i = signature.getSignedInfo().getReferences().iterator();
- for (int j=0; i.hasNext(); j++) {
- Reference ref = (Reference) i.next();
+ Iterator<Reference> i =
+ signature.getSignedInfo().getReferences().iterator();
+ for (int j = 0; i.hasNext(); j++) {
+ Reference ref = i.next();
if (!digestInputEqual(ref)) {
throw new Exception
("cached data for Reference[" + j + "] is not correct");
@@ -88,10 +89,10 @@
// check that dereferenced data does not contain comment nodes
if (ref.getURI() == "") {
System.out.println("checking deref data");
- NodeSetData data = (NodeSetData) ref.getDereferencedData();
- Iterator ni = data.iterator();
- while (ni.hasNext()) {
- Node n = (Node) ni.next();
+ @SuppressWarnings("unchecked")
+ NodeSetData<Node> data =
+ (NodeSetData<Node>)ref.getDereferencedData();
+ for (Node n : data) {
if (n.getNodeType() == Node.COMMENT_NODE) {
throw new Exception("dereferenced data for " +
" Reference[" + j + " contains comment node");
--- a/jdk/test/javax/xml/crypto/dsig/X509KeySelector.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/javax/xml/crypto/dsig/X509KeySelector.java Fri Nov 21 14:58:29 2014 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -139,9 +139,7 @@
}
// Iterate through KeyInfo types
- Iterator i = keyInfo.getContent().iterator();
- while (i.hasNext()) {
- XMLStructure kiType = (XMLStructure) i.next();
+ for (XMLStructure kiType : keyInfo.getContent()) {
// check X509Data
if (kiType instanceof X509Data) {
X509Data xd = (X509Data) kiType;
@@ -303,9 +301,7 @@
}
Collection<X509Certificate> certs = new ArrayList<>();
- Iterator xi = xd.getContent().iterator();
- while (xi.hasNext()) {
- Object o = xi.next();
+ for (Object o : xd.getContent()) {
// check X509IssuerSerial
if (o instanceof X509IssuerSerial) {
X509IssuerSerial xis = (X509IssuerSerial) o;
--- a/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java Fri Nov 21 14:58:29 2014 -0800
@@ -128,8 +128,7 @@
*/
private static final Pattern useGcPattern = Pattern.compile(
"(?:\\-XX\\:[\\+\\-]Use.+GC)"
- + "|(?:\\-Xconcgc)"
- + "|(?:\\-Xincgc)");
+ + "|(?:\\-Xconcgc)");
public static List<String> removeGcOpts(List<String> opts) {
List<String> optsWithoutGC = new ArrayList<String>();
for (String opt : opts) {
--- a/jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/java2d/cmm/ColorConvertOp/ColConvCCMTest.java Fri Nov 21 14:58:29 2014 -0800
@@ -23,7 +23,7 @@
/**
* @test
- * @bug 6476665 7033534 6830714
+ * @bug 6476665 7033534 6830714 8052162
* @summary Verifies color conversion of Component Color Model based images
* @run main ColConvCCMTest
*/
--- a/jdk/test/sun/net/www/http/HttpClient/StreamingRetry.java Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/net/www/http/HttpClient/StreamingRetry.java Fri Nov 21 14:58:29 2014 -0800
@@ -23,8 +23,8 @@
/*
* @test
- * @bug 6672144
- * @summary HttpURLConnection.getInputStream sends POST request after failed chunked send
+ * @bug 6672144 8050983
+ * @summary Do not retry failed request with a streaming body.
*/
import java.net.HttpURLConnection;
@@ -33,6 +33,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import static java.lang.System.out;
public class StreamingRetry implements Runnable {
static final int ACCEPT_TIMEOUT = 20 * 1000; // 20 seconds
@@ -43,11 +44,17 @@
}
void instanceMain() throws IOException {
- test();
+ out.println("Test with default method");
+ test(null);
+ out.println("Test with POST method");
+ test("POST");
+ out.println("Test with PUT method");
+ test("PUT");
+
if (failed > 0) throw new RuntimeException("Some tests failed");
}
- void test() throws IOException {
+ void test(String method) throws IOException {
ss = new ServerSocket(0);
ss.setSoTimeout(ACCEPT_TIMEOUT);
int port = ss.getLocalPort();
@@ -58,6 +65,8 @@
URL url = new URL("http://localhost:" + port + "/");
HttpURLConnection uc = (HttpURLConnection) url.openConnection();
uc.setDoOutput(true);
+ if (method != null)
+ uc.setRequestMethod(method);
uc.setChunkedStreamingMode(4096);
OutputStream os = uc.getOutputStream();
os.write("Hello there".getBytes());
@@ -79,7 +88,7 @@
ss.close();
fail("The server shouldn't accept a second connection");
} catch (IOException e) {
- //OK, the clien will close the server socket if successfull
+ //OK, the client will close the server socket if successful
}
}
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION Fri Nov 21 14:58:29 2014 -0800
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2014g
+tzdata2014j
--- a/jdk/test/sun/util/calendar/zi/tzdata/africa Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/africa Fri Nov 21 14:58:29 2014 -0800
@@ -29,20 +29,19 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2014-10-31):
#
-# A good source for time zone historical data outside the U.S. is
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# Another source occasionally used is Edward W. Whitman, World Time Differences,
# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
@@ -88,7 +87,6 @@
# 3:00 CAST Central Africa Summer Time (no longer used)
# 3:00 SAST South Africa Summer Time (no longer used)
# 3:00 EAT East Africa Time
-# 4:00 EAST East Africa Summer Time (no longer used)
# Algeria
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -133,23 +131,13 @@
# See Africa/Lagos.
# Botswana
-# From Paul Eggert (2013-02-21):
-# Milne says they were regulated by the Cape Town Signal in 1899;
-# assume they switched to 2:00 when Cape Town did.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Gaborone 1:43:40 - LMT 1885
- 1:30 - SAST 1903 Mar
- 2:00 - CAT 1943 Sep 19 2:00
- 2:00 1:00 CAST 1944 Mar 19 2:00
- 2:00 - CAT
+# See Africa/Maputo.
# Burkina Faso
# See Africa/Abidjan.
# Burundi
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Bujumbura 1:57:28 - LMT 1890
- 2:00 - CAT
+# See Africa/Maputo.
# Cameroon
# See Africa/Lagos.
@@ -179,15 +167,10 @@
1:00 - WAT
# Comoros
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Comoro 2:53:04 - LMT 1911 Jul # Moroni, Gran Comoro
- 3:00 - EAT
+# See Africa/Nairobi.
# Democratic Republic of the Congo
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Lubumbashi 1:49:52 - LMT 1897 Nov 9
- 2:00 - CAT
-# The above is for the eastern part; see Africa/Lagos for the western part.
+# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
# Republic of the Congo
# See Africa/Lagos.
@@ -208,9 +191,7 @@
Link Africa/Abidjan Atlantic/St_Helena # St Helena
# Djibouti
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Djibouti 2:52:36 - LMT 1911 Jul
- 3:00 - EAT
+# See Africa/Nairobi.
###############################################################################
@@ -339,7 +320,7 @@
# Egypt is to change back to Daylight system on May 15
# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
-# From Gunther Vermier (2015-05-13):
+# From Gunther Vermier (2014-05-13):
# our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
# From Imed Chihi (2014-06-04):
@@ -423,27 +404,8 @@
# See Africa/Lagos.
# Eritrea
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Asmara 2:35:32 - LMT 1870
- 2:35:32 - AMT 1890 # Asmara Mean Time
- 2:35:20 - ADMT 1936 May 5 # Adis Dera MT
- 3:00 - EAT
-
# Ethiopia
-# From Paul Eggert (2014-07-31):
-# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
-# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
-# 02:00 or 14:00. Keep this in mind when you ask the time in Amharic.
-#
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
-# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
-# 1890, and that they switched to 3:00 on 1936-05-05. Perhaps 38E50
-# was for Adis Dera. Quite likely the Shanks data entries are wrong
-# anyway.
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Addis_Ababa 2:34:48 - LMT 1870
- 2:35:20 - ADMT 1936 May 5 # Adis Dera MT
- 3:00 - EAT
+# See Africa/Nairobi.
# Gabon
# See Africa/Lagos.
@@ -487,13 +449,18 @@
2:30 - BEAT 1940
2:45 - BEAUT 1960
3:00 - EAT
+Link Africa/Nairobi Africa/Addis_Ababa # Ethiopia
+Link Africa/Nairobi Africa/Asmara # Eritrea
+Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
+Link Africa/Nairobi Africa/Djibouti
+Link Africa/Nairobi Africa/Kampala # Uganda
+Link Africa/Nairobi Africa/Mogadishu # Somalia
+Link Africa/Nairobi Indian/Antananarivo # Madagascar
+Link Africa/Nairobi Indian/Comoro
+Link Africa/Nairobi Indian/Mayotte
# Lesotho
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Maseru 1:50:00 - LMT 1903 Mar
- 2:00 - SAST 1943 Sep 19 2:00
- 2:00 1:00 SAST 1944 Mar 19 2:00
- 2:00 - SAST
+# See Africa/Johannesburg.
# Liberia
# From Paul Eggert (2006-03-22):
@@ -568,16 +535,10 @@
2:00 - EET
# Madagascar
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Antananarivo 3:10:04 - LMT 1911 Jul
- 3:00 - EAT 1954 Feb 27 23:00s
- 3:00 1:00 EAST 1954 May 29 23:00s
- 3:00 - EAT
+# See Africa/Nairobi.
# Malawi
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Blantyre 2:20:00 - LMT 1903 Mar
- 2:00 - CAT
+# See Africa/Maputo.
# Mali
# Mauritania
@@ -677,9 +638,7 @@
# no information; probably like Indian/Mauritius
# Mayotte
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Indian/Mayotte 3:00:56 - LMT 1911 Jul # Mamoutzou
- 3:00 - EAT
+# See Africa/Nairobi.
# Morocco
# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
@@ -987,6 +946,13 @@
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Maputo 2:10:20 - LMT 1903 Mar
2:00 - CAT
+Link Africa/Maputo Africa/Blantyre # Malawi
+Link Africa/Maputo Africa/Bujumbura # Burundi
+Link Africa/Maputo Africa/Gaborone # Botswana
+Link Africa/Maputo Africa/Harare # Zimbabwe
+Link Africa/Maputo Africa/Kigali # Rwanda
+Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo
+Link Africa/Maputo Africa/Lusaka # Zambia
# Namibia
# The 1994-04-03 transition is from Shanks & Pottenger.
@@ -1054,9 +1020,7 @@
# Tromelin - inhabited until at least 1958
# Rwanda
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Kigali 2:00:16 - LMT 1935 Jun
- 2:00 - CAT
+# See Africa/Maputo.
# St Helena
# See Africa/Abidjan.
@@ -1086,11 +1050,7 @@
# See Africa/Abidjan.
# Somalia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Mogadishu 3:01:28 - LMT 1893 Nov
- 3:00 - EAT 1931
- 2:30 - BEAT 1957
- 3:00 - EAT
+# See Africa/Nairobi.
# South Africa
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -1100,6 +1060,9 @@
Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
1:30 - SAST 1903 Mar
2:00 SA SAST
+Link Africa/Johannesburg Africa/Maseru # Lesotho
+Link Africa/Johannesburg Africa/Mbabane # Swaziland
+#
# Marion and Prince Edward Is
# scientific station since 1947
# no information
@@ -1127,16 +1090,10 @@
Link Africa/Khartoum Africa/Juba
# Swaziland
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Mbabane 2:04:24 - LMT 1903 Mar
- 2:00 - SAST
+# See Africa/Johannesburg.
# Tanzania
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Dar_es_Salaam 2:37:08 - LMT 1931
- 3:00 - EAT 1948
- 2:45 - BEAUT 1961
- 3:00 - EAT
+# See Africa/Nairobi.
# Togo
# See Africa/Abidjan.
@@ -1242,19 +1199,8 @@
1:00 Tunisia CE%sT
# Uganda
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Kampala 2:09:40 - LMT 1928 Jul
- 3:00 - EAT 1930
- 2:30 - BEAT 1948
- 2:45 - BEAUT 1957
- 3:00 - EAT
+# See Africa/Nairobi.
# Zambia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Lusaka 1:53:08 - LMT 1903 Mar
- 2:00 - CAT
-
# Zimbabwe
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Africa/Harare 2:04:12 - LMT 1903 Mar
- 2:00 - CAT
+# See Africa/Maputo.
--- a/jdk/test/sun/util/calendar/zi/tzdata/asia Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/asia Fri Nov 21 14:58:29 2014 -0800
@@ -29,20 +29,19 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2013-08-11):
+# From Paul Eggert (2014-10-31):
#
-# A good source for time zone historical data outside the U.S. is
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# Another source occasionally used is Edward W. Whitman, World Time Differences,
# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
@@ -70,10 +69,11 @@
# 3:30 IRST IRDT Iran
# 4:00 GST Gulf*
# 5:30 IST India
-# 7:00 ICT Indochina*
+# 7:00 ICT Indochina, most times and locations*
# 7:00 WIB west Indonesia (Waktu Indonesia Barat)
# 8:00 WITA central Indonesia (Waktu Indonesia Tengah)
# 8:00 CST China
+# 8:00 IDT Indochina, 1943-45, 1947-55, 1960-75 (some locations)*
# 8:00 JWST Western Standard Time (Japan, 1896/1937)*
# 9:00 JCST Central Standard Time (Japan, 1896/1937)
# 9:00 WIT east Indonesia (Waktu Indonesia Timur)
@@ -294,12 +294,8 @@
6:30 - MMT # Myanmar Time
# Cambodia
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Phnom_Penh 6:59:40 - LMT 1906 Jun 9
- 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT?
- 7:00 - ICT 1912 May
- 8:00 - ICT 1931 May
- 7:00 - ICT
+# See Asia/Bangkok.
+
# China
@@ -916,6 +912,10 @@
# Indonesia
#
+# From Paul Eggert (2014-09-06):
+# The 1876 Report of the Secretary of the [US] Navy, p 306 says that Batavia
+# civil time was 7:07:12.5; round to even for Jakarta.
+#
# From Gwillim Law (2001-05-28), overriding Shanks & Pottenger:
# http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime
# says that Indonesia's time zones changed on 1988-01-01. Looking at some
@@ -1685,44 +1685,70 @@
# Korea (North and South)
# From Annie I. Bang (2006-07-10):
-# http://www.koreaherald.co.kr/SITE/data/html_dir/2006/07/10/200607100012.asp
-# The Ministry of Commerce, Industry and Energy has already
-# commissioned a research project [to reintroduce DST] and has said
-# the system may begin as early as 2008.... Korea ran a daylight
-# saving program from 1949-61 but stopped it during the 1950-53 Korean War.
+# http://www.koreaherald.com/view.php?ud=200607100012
+# Korea ran a daylight saving program from 1949-61 but stopped it
+# during the 1950-53 Korean War. The system was temporarily enforced
+# between 1987 and 1988 ...
-# From Shanks & Pottenger:
+# From Sanghyuk Jung (2014-10-29):
+# http://mm.icann.org/pipermail/tz/2014-October/021830.html
+# According to the Korean Wikipedia
+# http://ko.wikipedia.org/wiki/한국_표준시
+# [oldid=12896437 2014-09-04 08:03 UTC]
+# DST in Republic of Korea was as follows.... And I checked old
+# newspapers in Korean, all articles correspond with data in Wikipedia.
+# For example, the article in 1948 (Korean Language) proved that DST
+# started at June 1 in that year. For another example, the article in
+# 1988 said that DST started at 2:00 AM in that year.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule ROK 1960 only - May 15 0:00 1:00 D
-Rule ROK 1960 only - Sep 13 0:00 0 S
-Rule ROK 1987 1988 - May Sun>=8 0:00 1:00 D
-Rule ROK 1987 1988 - Oct Sun>=8 0:00 0 S
+Rule ROK 1948 only - Jun 1 0:00 1:00 D
+Rule ROK 1948 only - Sep 13 0:00 0 S
+Rule ROK 1949 only - Apr 3 0:00 1:00 D
+Rule ROK 1949 1951 - Sep Sun>=8 0:00 0 S
+Rule ROK 1950 only - Apr 1 0:00 1:00 D
+Rule ROK 1951 only - May 6 0:00 1:00 D
+Rule ROK 1955 only - May 5 0:00 1:00 D
+Rule ROK 1955 only - Sep 9 0:00 0 S
+Rule ROK 1956 only - May 20 0:00 1:00 D
+Rule ROK 1956 only - Sep 30 0:00 0 S
+Rule ROK 1957 1960 - May Sun>=1 0:00 1:00 D
+Rule ROK 1957 1960 - Sep Sun>=18 0:00 0 S
+Rule ROK 1987 1988 - May Sun>=8 2:00 1:00 D
+Rule ROK 1987 1988 - Oct Sun>=8 3:00 0 S
-# From Paul Eggert (2014-07-01):
-# The following entries are from Shanks & Pottenger, except that I
-# guessed that time zone abbreviations through 1945 followed the same
+# From Paul Eggert (2014-10-30):
+# The Korean Wikipedia entry gives the following sources for UT offsets:
+#
+# 1908: Official Journal Article No. 3994 (Edict No. 5)
+# 1912: Governor-General of Korea Official Gazette Issue No. 367
+# (Announcement No. 338)
+# 1954: Presidential Decree No. 876 (1954-03-17)
+# 1961: Law No. 676 (1961-08-07)
+# 1987: Law No. 3919 (1986-12-31)
+#
+# The Wikipedia entry also has confusing information about a change
+# to UT+9 in April 1910, but then what would be the point of the later change
+# to UT+9 on 1912-01-01? Omit the 1910 change for now.
+#
+# I guessed that time zone abbreviations through 1945 followed the same
# rules as discussed under Taiwan, with nominal switches from JST to KST
# when the respective cities were taken over by the Allies after WWII.
+#
+# For Pyongyang we have no information; guess no changes since World War II.
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Seoul 8:27:52 - LMT 1890
- 8:30 - KST 1904 Dec
- 9:00 - JCST 1928
- 8:30 - KST 1932
+Zone Asia/Seoul 8:27:52 - LMT 1908 Apr 1
+ 8:30 - KST 1912 Jan 1
9:00 - JCST 1937 Oct 1
9:00 - JST 1945 Sep 8
9:00 - KST 1954 Mar 21
- 8:00 ROK K%sT 1961 Aug 10
- 8:30 - KST 1968 Oct
+ 8:30 ROK K%sT 1961 Aug 10
9:00 ROK K%sT
-Zone Asia/Pyongyang 8:23:00 - LMT 1890
- 8:30 - KST 1904 Dec
- 9:00 - JCST 1928
- 8:30 - KST 1932
+Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1
+ 8:30 - KST 1912 Jan 1
9:00 - JCST 1937 Oct 1
9:00 - JST 1945 Aug 24
- 9:00 - KST 1954 Mar 21
- 8:00 - KST 1961 Aug 10
9:00 - KST
###############################################################################
@@ -1733,12 +1759,8 @@
3:00 - AST
# Laos
-# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Vientiane 6:50:24 - LMT 1906 Jun 9 # or Viangchan
- 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT?
- 7:00 - ICT 1912 May
- 8:00 - ICT 1931 May
- 7:00 - ICT
+# See Asia/Bangkok.
+
# Lebanon
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
@@ -2751,6 +2773,8 @@
Zone Asia/Bangkok 6:42:04 - LMT 1880
6:42:04 - BMT 1920 Apr # Bangkok Mean Time
7:00 - ICT
+Link Asia/Bangkok Asia/Phnom_Penh # Cambodia
+Link Asia/Bangkok Asia/Vientiane # Laos
# Turkmenistan
# From Shanks & Pottenger.
@@ -2788,22 +2812,65 @@
# Vietnam
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2014-10-04):
# Milne gives 7:16:56 for the meridian of Saigon in 1899, as being
# used in Lower Laos, Cambodia, and Annam. But this is quite a ways
# from Saigon's location. For now, ignore this and stick with Shanks
-# and Pottenger.
+# and Pottenger for LMT before 1906.
# From Arthur David Olson (2008-03-18):
# The English-language name of Vietnam's most populous city is "Ho Chi Minh
# City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters.
-# From Shanks & Pottenger:
+# From Paul Eggert (2014-10-21) after a heads-up from Trần Ngọc Quân:
+# Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)"
+# (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50,
+# is quoted verbatim in:
+# http://www.thoigian.com.vn/?mPage=P80D01
+# is translated by Brian Inglis in:
+# http://mm.icann.org/pipermail/tz/2014-October/021654.html
+# and is the basis for the information below.
+#
+# The 1906 transition was effective July 1 and standardized Indochina to
+# Phù Liễn Observatory, legally 104 deg. 17'17" east of Paris.
+# It's unclear whether this meant legal Paris Mean Time (00:09:21) or
+# the Paris Meridian (2 deg. 20'14.03" E); the former yields 07:06:30.1333...
+# and the latter 07:06:29.333... so either way it rounds to 07:06:30,
+# which is used below even though the modern-day Phù Liễn Observatory
+# is closer to 07:06:31. Abbreviate Phù Liễn Mean Time as PLMT.
+#
+# The following transitions occurred in Indochina in general (before 1954)
+# and in South Vietnam in particular (after 1954):
+# To 07:00 on 1911-05-01.
+# To 08:00 on 1942-12-31 at 23:00.
+# To 09:00 in 1945-03-14 at 23:00.
+# To 07:00 on 1945-09-02 in Vietnam.
+# To 08:00 on 1947-04-01 in French-controlled Indochina.
+# To 07:00 on 1955-07-01 in South Vietnam.
+# To 08:00 on 1959-12-31 at 23:00 in South Vietnam.
+# To 07:00 on 1975-06-13 in South Vietnam.
+#
+# Trần cites the following sources; it's unclear which supplied the info above.
+#
+# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội,
+# No. 9, Paris, February 1982.
+#
+# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)",
+# NXB Thống kê, Hanoi, 2000.
+#
+# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu",
+# NXB Thuận Hoá, Huế, 1995.
+
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
-Zone Asia/Ho_Chi_Minh 7:06:40 - LMT 1906 Jun 9
- 7:06:20 - SMT 1911 Mar 11 0:01 # Saigon MT?
- 7:00 - ICT 1912 May
- 8:00 - ICT 1931 May
+Zone Asia/Ho_Chi_Minh 7:06:40 - LMT 1906 Jul 1
+ 7:06:30 - PLMT 1911 May 1
+ 7:00 - ICT 1942 Dec 31 23:00
+ 8:00 - IDT 1945 Mar 14 23:00
+ 9:00 - JST 1945 Sep 2
+ 7:00 - ICT 1947 Apr 1
+ 8:00 - IDT 1955 Jul 1
+ 7:00 - ICT 1959 Dec 31 23:00
+ 8:00 - IDT 1975 Jun 13
7:00 - ICT
# Yemen
--- a/jdk/test/sun/util/calendar/zi/tzdata/australasia Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/australasia Fri Nov 21 14:58:29 2014 -0800
@@ -354,20 +354,27 @@
# Fiji will end DST on 2014-01-19 02:00:
# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
-# From Paul Eggert (2014-01-10):
-# For now, guess that Fiji springs forward the Sunday before the fourth
-# Monday in October, and springs back the penultimate Sunday in January.
-# This is ad hoc, but matches recent practice.
+# From Ken Rylander (2014-10-20):
+# DST will start Nov. 2 this year.
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-NOVEMBER-2ND.aspx
+
+# From Paul Eggert (2014-10-20):
+# For now, guess DST from 02:00 the first Sunday in November to
+# 03:00 the first Sunday on or after January 18. Although ad hoc, it
+# matches this year's plan and seems more likely to match future
+# practice than guessing no DST.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
Rule Fiji 1999 2000 - Feb lastSun 3:00 0 -
Rule Fiji 2009 only - Nov 29 2:00 1:00 S
Rule Fiji 2010 only - Mar lastSun 3:00 0 -
-Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S
+Rule Fiji 2010 2013 - Oct Sun>=21 2:00 1:00 S
Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
-Rule Fiji 2014 max - Jan Sun>=18 2:00 0 -
+Rule Fiji 2014 only - Jan Sun>=18 2:00 0 -
+Rule Fiji 2014 max - Nov Sun>=1 2:00 1:00 S
+Rule Fiji 2015 max - Jan Sun>=18 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji FJ%sT # Fiji Time
@@ -542,6 +549,30 @@
Zone Pacific/Port_Moresby 9:48:40 - LMT 1880
9:48:32 - PMMT 1895 # Port Moresby Mean Time
10:00 - PGT # Papua New Guinea Time
+#
+# From Paul Eggert (2014-10-13):
+# Base the Bougainville entry on the Arawa-Kieta region, which appears to have
+# the most people even though it was devastated in the Bougainville Civil War.
+#
+# Although Shanks gives 1942-03-15 / 1943-11-01 for JST, these dates
+# are apparently rough guesswork from the starts of military campaigns.
+# The World War II entries below are instead based on Arawa-Kieta.
+# The Japanese occupied Kieta in July 1942,
+# according to the Pacific War Online Encyclopedia
+# http://pwencycl.kgbudge.com/B/o/Bougainville.htm
+# and seem to have controlled it until their 1945-08-21 surrender.
+#
+# The Autonomous Region of Bougainville plans to switch from UTC+10 to UTC+11
+# on 2014-12-28 at 02:00. They call UTC+11 "Bougainville Standard Time";
+# abbreviate this as BST. See:
+# http://www.bougainville24.com/bougainville-issues/bougainville-gets-own-timezone/
+#
+Zone Pacific/Bougainville 10:22:16 - LMT 1880
+ 9:48:32 - PMMT 1895
+ 10:00 - PGT 1942 Jul
+ 9:00 - JST 1945 Aug 21
+ 10:00 - PGT 2014 Dec 28 2:00
+ 11:00 - BST
# Pitcairn
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
@@ -789,19 +820,19 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2013-02-21):
-# A good source for time zone historical data outside the U.S. is
+# From Paul Eggert (2014-10-31):
+#
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# Another source occasionally used is Edward W. Whitman, World Time Differences,
# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
@@ -826,6 +857,7 @@
# 10:00 AEST AEDT Eastern Australia
# 10:00 ChST Chamorro
# 10:30 LHST LHDT Lord Howe*
+# 11:00 BST Bougainville*
# 11:30 NZMT NZST New Zealand through 1945
# 12:00 NZST NZDT New Zealand 1946-present
# 12:15 CHAST Chatham through 1945*
--- a/jdk/test/sun/util/calendar/zi/tzdata/europe Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/europe Fri Nov 21 14:58:29 2014 -0800
@@ -29,16 +29,19 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2014-05-31):
-# A good source for time zone historical data outside the U.S. is
+# From Paul Eggert (2014-10-31):
+#
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# A reliable and entertaining source about time zones is
# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
@@ -91,10 +94,11 @@
# 0:00 WET WEST WEMT Western Europe
# 0:19:32.13 AMT NST Amsterdam, Netherlands Summer (1835-1937)*
# 0:20 NET NEST Netherlands (1937-1940)*
+# 1:00 BST British Standard (1968-1971)
# 1:00 CET CEST CEMT Central Europe
# 1:00:14 SET Swedish (1879-1899)*
# 2:00 EET EEST Eastern Europe
-# 3:00 FET Further-eastern Europe*
+# 3:00 FET Further-eastern Europe (2011-2014)*
# 3:00 MSK MSD MSM* Moscow
# From Peter Ilieve (1994-12-04),
@@ -309,6 +313,14 @@
# "Timeball on the ballast office is down. Dunsink time."
# -- James Joyce, Ulysses
+# "Countess Markievicz ... claimed that the [1916] abolition of Dublin Mean Time
+# was among various actions undertaken by the 'English' government that
+# would 'put the whole country into the SF (Sinn Féin) camp'. She claimed
+# Irish 'public feeling (was) outraged by forcing of English time on us'."
+# -- Parsons M. Dublin lost its time zone - and 25 minutes - after 1916 Rising.
+# Irish Times 2014-10-27.
+# http://www.irishtimes.com/news/politics/dublin-lost-its-time-zone-and-25-minutes-after-1916-rising-1.1977411
+
# From Joseph S. Myers (2005-01-26):
# Irish laws are available online at <http://www.irishstatutebook.ie>.
# These include various relating to legal time, for example:
@@ -616,6 +628,7 @@
Rule Russia 1993 2010 - Mar lastSun 2:00s 1:00 S
Rule Russia 1993 1995 - Sep lastSun 2:00s 0 -
Rule Russia 1996 2010 - Oct lastSun 2:00s 0 -
+# As described below, Russia's 2014 change affects Zone data, not Rule data.
# From Alexander Krivenyshev (2011-06-14):
# According to Kremlin press service, Russian President Dmitry Medvedev
@@ -746,6 +759,13 @@
# http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
# http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
# http://news.tut.by/society/250578.html
+#
+# From Alexander Bokovoy (2014-10-09):
+# Belarussian government decided against changing to winter time....
+# http://eng.belta.by/all_news/society/Belarus-decides-against-adjusting-time-in-Russias-wake_i_76335.html
+# From Paul Eggert (2014-10-08):
+# Hence Belarus can share time zone abbreviations with Moscow again.
+#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Minsk 1:50:16 - LMT 1880
1:50 - MMT 1924 May 2 # Minsk Mean Time
@@ -758,7 +778,8 @@
2:00 - EET 1992 Mar 29 0:00s
2:00 1:00 EEST 1992 Sep 27 0:00s
2:00 Russia EE%sT 2011 Mar 27 2:00s
- 3:00 - FET
+ 3:00 - FET 2014 Oct 26 1:00s
+ 3:00 - MSK
# Belgium
#
@@ -2524,7 +2545,7 @@
# The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus
# realigning itself with KRAT.
-Zone Asia/Novokuznetsk 5:48:48 - NMT 1920 Jan 6
+Zone Asia/Novokuznetsk 5:48:48 - LMT 1924 May 1
6:00 - KRAT 1930 Jun 21 # Krasnoyarsk Time
7:00 Russia KRA%sT 1991 Mar 31 2:00s
6:00 Russia KRA%sT 1992 Jan 19 2:00s
--- a/jdk/test/sun/util/calendar/zi/tzdata/leapseconds Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/leapseconds Fri Nov 21 14:58:29 2014 -0800
@@ -33,8 +33,8 @@
# The NTP Timescale and Leap Seconds
# http://www.eecis.udel.edu/~mills/leap.html
-# The International Earth Rotation Service periodically uses leap seconds
-# to keep UTC to within 0.9 s of UT1
+# The International Earth Rotation and Reference Systems Service
+# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
# (which measures the true angular orientation of the earth in space); see
# Terry J Quinn, The BIPM and the accurate measure of time,
# Proc IEEE 79, 7 (July 1991), 894-905 <http://dx.doi.org/10.1109/5.84965>.
--- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/northamerica Fri Nov 21 14:58:29 2014 -0800
@@ -300,6 +300,12 @@
# time zone, but we do go by the Eastern time zone because so many people work
# in Columbus."
+# From Paul Eggert (2014-09-06):
+# Monthly Notices of the Royal Astronomical Society 44, 4 (1884-02-08), 208
+# says that New York City Hall time was 3 minutes 58.4 seconds fast of
+# Eastern time (i.e., -4:56:01.6) just before the 1883 switch. Round to the
+# nearest second.
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER
Rule NYC 1920 only - Mar lastSun 2:00 1:00 D
Rule NYC 1920 only - Oct lastSun 2:00 0 S
@@ -1008,19 +1014,19 @@
################################################################################
-# From Paul Eggert (2006-03-22):
-# A good source for time zone historical data outside the U.S. is
+# From Paul Eggert (2014-10-31):
+#
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
# Other sources occasionally used include:
#
@@ -1118,17 +1124,16 @@
# An amendment to the Interpretation Act was registered on February 19/2007....
# http://action.attavik.ca/home/justice-gn/attach/2007/gaz02part2.pdf
-# From Paul Eggert (2006-04-25):
+# From Paul Eggert (2014-10-18):
# H. David Matthews and Mary Vincent's map
# "It's about TIME", _Canadian Geographic_ (September-October 1998)
-# http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp
+# http://www.canadiangeographic.ca/Magazine/SO98/alacarte.asp
# contains detailed boundaries for regions observing nonstandard
# time and daylight saving time arrangements in Canada circa 1998.
#
-# INMS, the Institute for National Measurement Standards in Ottawa, has
-# information about standard and daylight saving time zones in Canada.
-# http://inms-ienm.nrc-cnrc.gc.ca/en/time_services/daylight_saving_e.php
-# (updated periodically).
+# National Research Council Canada maintains info about time zones and DST.
+# http://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html
+# http://www.nrc-cnrc.gc.ca/eng/services/time/faq/index.html#Q5
# Its unofficial information is often taken from Matthews and Vincent.
# From Paul Eggert (2006-06-27):
@@ -1993,10 +1998,7 @@
# [Also see <http://www.nunatsiaq.com/nunavut/nvt10309_06.html> (2001-03-09).]
# From Gwillim Law (2005-05-21):
-# According to maps at
-# http://inms-ienm.nrc-cnrc.gc.ca/images/time_services/TZ01SWE.jpg
-# http://inms-ienm.nrc-cnrc.gc.ca/images/time_services/TZ01SSE.jpg
-# (both dated 2003), and
+# According to ...
# http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp
# (from a 1998 Canadian Geographic article), the de facto and de jure time
# for Southampton Island (at the north end of Hudson Bay) is UTC-5 all year
@@ -2005,9 +2007,11 @@
# predates the creation of Nunavut, it probably goes back many years....
# The Inuktitut name of Coral Harbour is Sallit, but it's rarely used.
#
-# From Paul Eggert (2005-07-26):
+# From Paul Eggert (2014-10-17):
# For lack of better information, assume that Southampton Island observed
-# daylight saving only during wartime.
+# daylight saving only during wartime. Gwillim Law's email also
+# mentioned maps now maintained by National Research Council Canada;
+# see above for an up-to-date link.
# From Chris Walton (2007-03-01):
# ... the community of Resolute (located on Cornwallis Island in
@@ -3008,10 +3012,21 @@
# Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
# unspecified official document, and says "This time is used throughout the
# island". Go with Milne. Round to the nearest second as required by zic.
+#
+# Shanks & Pottenger give April 28 for the 1974 spring-forward transition, but
+# Lance Neita writes that Prime Minister Michael Manley decreed it January 5.
+# Assume Neita meant Jan 6 02:00, the same as the US. Neita also writes that
+# Manley's supporters associated this act with Manley's nickname "Joshua"
+# (recall that in the Bible the sun stood still at Joshua's request),
+# and with the Rod of Correction which Manley said he had received from
+# Haile Selassie, Emperor of Ethiopia. See:
+# Neita L. The politician in all of us. Jamaica Observer 2014-09-20
+# http://www.jamaicaobserver.com/columns/The-politician-in-all-of-us_17573647
+#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Jamaica -5:07:11 - LMT 1890 # Kingston
-5:07:11 - KMT 1912 Feb # Kingston Mean Time
- -5:00 - EST 1974 Apr 28 2:00
+ -5:00 - EST 1974
-5:00 US E%sT 1984
-5:00 - EST
@@ -3139,13 +3154,17 @@
# From Paul Eggert (2014-08-19):
# The 2014-08-13 Cabinet meeting decided to stay on UTC-4 year-round. See:
# http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
-# Model this as a switch from EST/EDT to AST on 2014-11-02 at 02:00.
+# Model this as a switch from EST/EDT to AST ...
+# From Chris Walton (2014-11-04):
+# ... the TCI government appears to have delayed the switch to
+# "permanent daylight saving time" by one year....
+# http://tcweeklynews.com/time-change-to-go-ahead-this-november-p5437-127.htm
#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Grand_Turk -4:44:32 - LMT 1890
-5:07:11 - KMT 1912 Feb # Kingston Mean Time
-5:00 - EST 1979
- -5:00 US E%sT 2014 Nov 2 2:00
+ -5:00 US E%sT 2015 Nov Sun>=1 2:00
-4:00 - AST
# British Virgin Is
--- a/jdk/test/sun/util/calendar/zi/tzdata/southamerica Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/southamerica Fri Nov 21 14:58:29 2014 -0800
@@ -29,23 +29,23 @@
# tz@iana.org for general use in the future). For more, please see
# the file CONTRIBUTING in the tz distribution.
-# From Paul Eggert (2006-03-22):
-# A good source for time zone historical data outside the U.S. is
+# From Paul Eggert (2014-10-31):
+#
+# Unless otherwise specified, the source for data through 1990 is:
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
# San Diego: ACS Publications, Inc. (2003).
-#
-# For data circa 1899, a common source is:
-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
+# Unfortunately this book contains many errors and cites no sources.
#
# Gwillim Law writes that a good source
# for recent time zone data is the International Air Transport
# Association's Standard Schedules Information Manual (IATA SSIM),
# published semiannually. Law sent in several helpful summaries
-# of the IATA's data after 1990.
+# of the IATA's data after 1990. Except where otherwise noted,
+# IATA SSIM is the source for entries after 1990.
#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1990, and IATA SSIM is the source for entries afterwards.
+# For data circa 1899, a common source is:
+# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
+# http://www.jstor.org/stable/1774359
#
# Earlier editions of these tables used the North American style (e.g. ARST and
# ARDT for Argentine Standard and Daylight Time), but the following quote
--- a/jdk/test/sun/util/calendar/zi/tzdata/zone.tab Thu Nov 13 15:45:45 2014 -0800
+++ b/jdk/test/sun/util/calendar/zi/tzdata/zone.tab Fri Nov 21 14:58:29 2014 -0800
@@ -330,7 +330,8 @@
PF -1732-14934 Pacific/Tahiti Society Islands
PF -0900-13930 Pacific/Marquesas Marquesas Islands
PF -2308-13457 Pacific/Gambier Gambier Islands
-PG -0930+14710 Pacific/Port_Moresby
+PG -0930+14710 Pacific/Port_Moresby most locations
+PG -0613+15534 Pacific/Bougainville Bougainville
PH +1435+12100 Asia/Manila
PK +2452+06703 Asia/Karachi
PL +5215+02100 Europe/Warsaw