/hg/release/icedtea7-forest-2.5/jdk: 34 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jul 15 21:12:13 UTC 2014
changeset 9e2c83b933da in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=9e2c83b933da
author: jbachorik
date: Fri Mar 07 10:15:36 2014 +0100
8029755: Enhance subject class
Reviewed-by: sla, dfuchs, hawtin
changeset d0c90bc3203b in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d0c90bc3203b
author: robm
date: Tue Apr 01 00:33:47 2014 +0100
8031346: Enhance RSA key handling
Reviewed-by: xuelei, coffeys
changeset 78416d802d8a in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=78416d802d8a
author: dbuck
date: Tue Mar 11 14:27:57 2014 -0700
8033055: Issues in 2d
Reviewed-by: bae, prr
changeset 71877574200d in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=71877574200d
author: jbachorik
date: Thu Feb 06 09:35:26 2014 +0100
8033301: Build more informative InfoBuilder
Reviewed-by: sla, ahgross
changeset 6c56c39d158e in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=6c56c39d158e
author: prr
date: Mon Mar 03 09:21:16 2014 -0800
8034267: Probabilistic native crash
Reviewed-by: bae, serb, mschoene
changeset 846120fc3c56 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=846120fc3c56
author: mbankal
date: Wed Mar 05 20:56:53 2014 -0800
8034272: Do not cram data into CRAM arrays
Reviewed-by: vinnie, coffeys, ahgross
changeset dc9f60e42c09 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=dc9f60e42c09
author: robm
date: Fri Apr 04 15:24:14 2014 +0100
8035004: Provider provides less service
Reviewed-by: mullan, coffeys
changeset f32deedfb537 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=f32deedfb537
author: igerasim
date: Tue Mar 04 23:56:51 2014 +0400
8035009: Make Proxy representations consistent
Reviewed-by: ahgross, jfranck
changeset c0001bb7ce01 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=c0001bb7ce01
author: malenkov
date: Thu Mar 13 14:58:55 2014 +0400
8035699: File choosers should be choosier
Reviewed-by: alexsch, art, skoivu
changeset dcb5dd7324ea in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=dcb5dd7324ea
author: twisti
date: Wed Mar 19 10:48:43 2014 -0700
8035788: Provide more consistency for lookups
Reviewed-by: jrose, vlivanov, ahgross
changeset c3f0ae45267b in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=c3f0ae45267b
author: vlivanov
date: Thu Mar 06 15:27:05 2014 +0400
8035793: Maximum arity maxed out
Reviewed-by: jrose, twisti, ahgross
changeset d09ddbd2412c in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d09ddbd2412c
author: robm
date: Thu Mar 27 17:28:32 2014 +0000
8036571: (process) Process process arguments carefully
Reviewed-by: rriggs, coffeys
changeset 9df8c6458818 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=9df8c6458818
author: kizune
date: Tue Mar 25 11:28:26 2014 -0700
8037046: Validate libraries to be loaded
Reviewed-by: ksrini, ahgross
changeset 8a34e29d3d66 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=8a34e29d3d66
author: xuelei
date: Wed Mar 26 03:45:30 2014 +0000
8037162: More robust DH exchanges
Reviewed-by: weijun, asmotrak, ahgross, robm
changeset a1b45c649b2d in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=a1b45c649b2d
author: igerasim
date: Fri Apr 25 13:33:04 2014 +0400
8039520: More atomicity of atomic updates
Reviewed-by: dl, skoivu, chegar
changeset 06c2f27f9fb1 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=06c2f27f9fb1
author: kizune
date: Wed Apr 09 13:16:33 2014 +0400
8001108: an attempt to use "<init>" as a method name should elicit NoSuchMethodException
Reviewed-by: twisti
changeset 4af97bce2a64 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=4af97bce2a64
author: kizune
date: Wed Apr 09 13:06:37 2014 +0400
8001109: arity mismatch on a call to spreader method handle should elicit IllegalArgumentException
Reviewed-by: twisti
changeset 46ef40e753c9 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=46ef40e753c9
author: dmarkov
date: Thu Apr 03 11:37:02 2014 +0400
8013611: Modal dialog fails to obtain keyboard focus
Reviewed-by: leonidr
changeset eb7088257217 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=eb7088257217
author: yhuang
date: Tue May 06 22:15:25 2014 -0700
8013836: getFirstDayOfWeek reports wrong day for pt-BR locale
Reviewed-by: naoto
changeset 36e00b819724 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=36e00b819724
author: bae
date: Thu Apr 03 17:09:54 2014 +0400
8019990: IM candidate window appears on the South-East corner of the display.
Reviewed-by: bagiras, serb
changeset dd67c72efeb3 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=dd67c72efeb3
author: anashaty
date: Fri Feb 07 16:00:49 2014 +0400
8023990: Regression: postscript size increase from 6u18
Reviewed-by: prr, bae
changeset 911255f51834 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=911255f51834
author: kizune
date: Wed Apr 09 13:00:26 2014 +0400
8024283: 10 nashorn tests fail with similar stack trace InternalError with cause being NoClassDefFoundError
Reviewed-by: twisti
changeset ce49a0e66877 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=ce49a0e66877
author: kizune
date: Thu Apr 10 13:55:57 2014 +0400
8024616: JSR292: lazily initialize core NamedFunctions used for bootstrapping
Reviewed-by: twisti
changeset 80bf5423c9f5 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=80bf5423c9f5
author: igerasim
date: Thu Feb 20 16:01:35 2014 +0400
8027212: java/nio/channels/Selector/SelectAfterRead.java fails intermittently
Reviewed-by: chegar, ewang
changeset 925adfa9ec52 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=925adfa9ec52
author: pchelko
date: Tue Feb 25 19:33:43 2014 +0400
8028285: RMI Thread can no longer call out to AWT
Reviewed-by: art, serb, ddehaven
changeset 07b27dc58b64 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=07b27dc58b64
author: kizune
date: Mon Feb 03 21:46:36 2014 +0400
8029177: [Parfait] warnings from b117 for jdk.src.share.native.com.sun.java.util.jar: JNI exception pending
Summary: Additional review by Chris Ries
Reviewed-by: jfranck, ksrini
changeset 36c573b56d77 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=36c573b56d77
author: mcherkas
date: Fri Apr 11 13:07:30 2014 +0400
8031075: [Regression] focus disappears with shift+tab on dialog having one focus component
Reviewed-by: art, serb
changeset 01302228866b in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=01302228866b
author: kizune
date: Mon Apr 14 13:48:47 2014 +0400
8032585: JSR292: IllegalAccessError when attempting to invoke protected method from different package
Reviewed-by: twisti
changeset 0d992147d2c1 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=0d992147d2c1
author: kizune
date: Mon Apr 21 13:37:43 2014 +0400
8033278: Missed access checks for Lookup.unreflect* after 8032585
Reviewed-by: twisti
changeset 3eb9292da245 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=3eb9292da245
author: vkempik
date: Tue Mar 25 14:11:22 2014 +0100
8036786: Update jdk7 testlibrary to match jdk8
Summary: Update testlibrary in jdk7, cumulative backport
Reviewed-by: alanb, sla
changeset 23e7becde5b1 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=23e7becde5b1
author: anashaty
date: Tue May 13 15:41:23 2014 +0400
8042582: Test java/awt/KeyboardFocusmanager/ChangeKFMTest/ChangeKFMTest.html fails on Windows x64
Reviewed-by: pchelko, ant
changeset f77f5440f6df in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=f77f5440f6df
author: pchelko
date: Mon May 19 18:31:48 2014 +0400
8042590: Running form URL throws NPE
Reviewed-by: anthony, serb
changeset d04ab74d7e60 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=d04ab74d7e60
author: aefimov
date: Mon May 19 01:51:35 2014 +0400
8043012: (tz) Support tzdata2014c
Reviewed-by: okutsu, peytoia
changeset a7b38ec2f074 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=a7b38ec2f074
author: mbankal
date: Fri Jul 04 14:03:26 2014 +0100
8031340: Better TLS/EC management
Reviewed-by: valeriep, coffeys, ahgross
diffstat:
make/java/util/FILES_properties.gmk | 1 +
make/sun/javazic/tzdata/VERSION | 2 +-
make/sun/javazic/tzdata/africa | 43 +
make/sun/javazic/tzdata/asia | 16 -
make/sun/javazic/tzdata/europe | 4 +
make/sun/security/ec/mapfile-vers | 3 +-
src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java | 93 +-
src/share/classes/com/sun/jmx/remote/util/CacheMap.java | 121 ---
src/share/classes/com/sun/security/sasl/CramMD5Base.java | 20 +-
src/share/classes/java/awt/Component.java | 2 +-
src/share/classes/java/awt/KeyboardFocusManager.java | 72 +-
src/share/classes/java/lang/ProcessBuilder.java | 6 +
src/share/classes/java/lang/invoke/DirectMethodHandle.java | 110 +-
src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java | 6 +
src/share/classes/java/lang/invoke/Invokers.java | 1 +
src/share/classes/java/lang/invoke/MethodHandle.java | 10 +
src/share/classes/java/lang/invoke/MethodHandleImpl.java | 34 +-
src/share/classes/java/lang/invoke/MethodHandles.java | 128 +++-
src/share/classes/java/lang/reflect/Proxy.java | 12 +-
src/share/classes/java/security/Provider.java | 36 +-
src/share/classes/java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java | 2 +
src/share/classes/javax/swing/filechooser/FileSystemView.java | 3 +-
src/share/classes/sun/awt/AppContext.java | 14 +
src/share/classes/sun/awt/FontConfiguration.java | 4 +-
src/share/classes/sun/invoke/util/VerifyAccess.java | 33 +-
src/share/classes/sun/security/ec/ECKeyPairGenerator.java | 23 +-
src/share/classes/sun/security/rsa/RSACore.java | 323 ++++++--
src/share/classes/sun/security/util/KeyUtil.java | 13 +-
src/share/classes/sun/util/resources/CalendarData_pt_BR.properties | 40 +
src/share/native/com/sun/java/util/jar/pack/defines.h | 3 +-
src/share/native/com/sun/java/util/jar/pack/jni.cpp | 99 +-
src/share/native/sun/awt/medialib/awt_ImagingLib.c | 26 +-
src/share/native/sun/font/freetypeScaler.c | 33 +-
src/share/native/sun/management/GcInfoBuilder.c | 2 +-
src/share/native/sun/security/ec/ECC_JNI.cpp | 119 +-
src/solaris/classes/sun/font/FcFontConfiguration.java | 19 +-
src/windows/bin/java_md.c | 8 +
src/windows/classes/sun/awt/shell/Win32ShellFolder2.java | 9 +-
src/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java | 10 +
src/windows/classes/sun/awt/windows/ThemeReader.java | 32 +-
src/windows/classes/sun/awt/windows/WToolkit.java | 18 +-
src/windows/classes/sun/awt/windows/WWindowPeer.java | 1 +
src/windows/native/sun/windows/awt_Component.cpp | 4 +-
src/windows/native/sun/windows/awt_Frame.cpp | 2 +
test/java/awt/Focus/8013611/JDK8013611.java | 111 ++
test/java/awt/Focus/DialogTraversFocusBackTest/DialogTraversFocusBackTest.java | 94 ++
test/java/awt/Frame/7024749/bug7024749.java | 2 +-
test/java/lang/invoke/JavaDocExamplesTest.java | 99 ++-
test/java/lang/invoke/MethodHandlesTest.java | 90 +-
test/java/lang/invoke/ProtectedMemberDifferentPackage/Test.java | 33 +
test/java/lang/invoke/ProtectedMemberDifferentPackage/p1/T2.java | 127 +++
test/java/lang/invoke/ProtectedMemberDifferentPackage/p2/T3.java | 32 +
test/java/nio/channels/Selector/ByteServer.java | 68 +-
test/java/nio/channels/Selector/ReadAfterConnect.java | 34 +-
test/java/nio/channels/Selector/SelectAfterRead.java | 92 +-
test/java/nio/channels/Selector/SelectWrite.java | 43 +-
test/javax/management/remote/mandatory/util/CacheMapTest.java | 110 --
test/lib/testlibrary/AssertsTest.java | 237 ++++++
test/lib/testlibrary/ClassFileInstaller.java | 5 +-
test/lib/testlibrary/OutputAnalyzerReportingTest.java | 122 +++
test/lib/testlibrary/jdk/testlibrary/Asserts.java | 395 ++++++++++
test/lib/testlibrary/jdk/testlibrary/InputArguments.java | 88 ++
test/lib/testlibrary/jdk/testlibrary/JDKToolFinder.java | 106 ++
test/lib/testlibrary/jdk/testlibrary/JDKToolLauncher.java | 134 +++
test/lib/testlibrary/jdk/testlibrary/JcmdBase.java | 47 +-
test/lib/testlibrary/jdk/testlibrary/JdkFinder.java | 78 -
test/lib/testlibrary/jdk/testlibrary/OutputAnalyzer.java | 157 ++-
test/lib/testlibrary/jdk/testlibrary/Platform.java | 103 ++
test/lib/testlibrary/jdk/testlibrary/ProcessThread.java | 143 +++
test/lib/testlibrary/jdk/testlibrary/ProcessTools.java | 195 ++++-
test/lib/testlibrary/jdk/testlibrary/StreamPumper.java | 151 +++-
test/lib/testlibrary/jdk/testlibrary/TestThread.java | 249 ++++++
test/lib/testlibrary/jdk/testlibrary/Utils.java | 232 +++++
test/lib/testlibrary/jdk/testlibrary/XRun.java | 56 +
test/sun/text/resources/LocaleData | 4 +-
test/sun/text/resources/LocaleDataTest.java | 4 +-
76 files changed, 3972 insertions(+), 1029 deletions(-)
diffs (truncated from 6869 to 500 lines):
diff -r 59d534f8c9fb -r a7b38ec2f074 make/java/util/FILES_properties.gmk
--- a/make/java/util/FILES_properties.gmk Sat Jun 14 08:08:05 2014 +0100
+++ b/make/java/util/FILES_properties.gmk Fri Jul 04 14:03:26 2014 +0100
@@ -107,6 +107,7 @@
sun/util/resources/CalendarData_pl.properties \
sun/util/resources/CalendarData_pt.properties \
sun/util/resources/CalendarData_pt_PT.properties \
+ sun/util/resources/CalendarData_pt_BR.properties \
sun/util/resources/CalendarData_ro.properties \
sun/util/resources/CalendarData_ru.properties \
sun/util/resources/CalendarData_sk.properties \
diff -r 59d534f8c9fb -r a7b38ec2f074 make/sun/javazic/tzdata/VERSION
--- a/make/sun/javazic/tzdata/VERSION Sat Jun 14 08:08:05 2014 +0100
+++ b/make/sun/javazic/tzdata/VERSION Fri Jul 04 14:03:26 2014 +0100
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2014b
+tzdata2014c
diff -r 59d534f8c9fb -r a7b38ec2f074 make/sun/javazic/tzdata/africa
--- a/make/sun/javazic/tzdata/africa Sat Jun 14 08:08:05 2014 +0100
+++ b/make/sun/javazic/tzdata/africa Fri Jul 04 14:03:26 2014 +0100
@@ -358,11 +358,54 @@
# http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
# </a>
+# From Ahmad El-Dardiry (2014-05-07):
+# Egypt is to change back to Daylight system on May 15
+# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
+
+# From Gunther Vermier (2015-05-13):
+# our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
+
+# From Paul Eggert (2014-05-13):
+# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
+# the change is because of blackouts in Cairo, even though Ahram Online (cited
+# above) says DST had no affect on electricity consumption. The AP story says
+# DST will not be observed during Ramadan. There is no information about when
+# DST will end. See:
+# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
+#
+# For now, guess that later transitions will use 2010's rules, and that
+# Egypt will agree with Morocco (see below) about the date Ramadan starts and
+# ends, though (unlike Morocco) it will switch at 00:00 standard time. In
+# Egypt the spring-forward transitions are removed for 2020-2022, when the
+# guessed spring-forward date falls during the estimated Ramadan, and all
+# transitions removed for 2023-2038, where the estimated Ramadan falls entirely
+# outside the guessed daylight-saving time. Ramadan intrudes on the guessed
+# DST starting in 2039, but that's beyond our somewhat-arbitrary cutoff.
+
Rule Egypt 2008 only - Aug lastThu 23:00s 0 -
Rule Egypt 2009 only - Aug 20 23:00s 0 -
Rule Egypt 2010 only - Aug 11 0:00 0 -
Rule Egypt 2010 only - Sep 10 0:00 1:00 S
Rule Egypt 2010 only - Sep lastThu 23:00s 0 -
+Rule Egypt 2014 only - May 15 24:00 1:00 S
+Rule Egypt 2014 only - Jun 29 0:00s 0 -
+Rule Egypt 2014 only - Jul 29 0:00s 1:00 S
+Rule Egypt 2014 max - Sep lastThu 23:00s 0 -
+Rule Egypt 2015 2019 - Apr lastFri 0:00s 1:00 S
+Rule Egypt 2015 only - Jun 18 0:00s 0 -
+Rule Egypt 2015 only - Jul 18 0:00s 1:00 S
+Rule Egypt 2016 only - Jun 7 0:00s 0 -
+Rule Egypt 2016 only - Jul 7 0:00s 1:00 S
+Rule Egypt 2017 only - May 27 0:00s 0 -
+Rule Egypt 2017 only - Jun 26 0:00s 1:00 S
+Rule Egypt 2018 only - May 16 0:00s 0 -
+Rule Egypt 2018 only - Jun 15 0:00s 1:00 S
+Rule Egypt 2019 only - May 6 0:00s 0 -
+Rule Egypt 2019 only - Jun 5 0:00s 1:00 S
+Rule Egypt 2020 only - May 24 0:00s 1:00 S
+Rule Egypt 2021 only - May 13 0:00s 1:00 S
+Rule Egypt 2022 only - May 3 0:00s 1:00 S
+Rule Egypt 2023 max - Apr lastFri 0:00s 1:00 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
diff -r 59d534f8c9fb -r a7b38ec2f074 make/sun/javazic/tzdata/asia
--- a/make/sun/javazic/tzdata/asia Sat Jun 14 08:08:05 2014 +0100
+++ b/make/sun/javazic/tzdata/asia Fri Jul 04 14:03:26 2014 +0100
@@ -1370,22 +1370,6 @@
# "Jordan will switch to winter time on Friday, October 27".
#
-# From Phil Pizzey (2009-04-02):
-# ...I think I may have spotted an error in the timezone data for
-# Jordan.
-# The current (2009d) asia file shows Jordan going to daylight
-# saving
-# time on the last Thursday in March.
-#
-# Rule Jordan 2000 max - Mar lastThu 0:00s 1:00 S
-#
-# However timeanddate.com, which I usually find reliable, shows Jordan
-# going to daylight saving time on the last Friday in March since 2002.
-# Please see
-# <a href="http://www.timeanddate.com/worldclock/timezone.html?n=11">
-# http://www.timeanddate.com/worldclock/timezone.html?n=11
-# </a>
-
# From Steffen Thorsen (2009-04-02):
# This single one might be good enough, (2009-03-24, Arabic):
# <a href="http://petra.gov.jo/Artical.aspx?Lng=2&Section=8&Artical=95279">
diff -r 59d534f8c9fb -r a7b38ec2f074 make/sun/javazic/tzdata/europe
--- a/make/sun/javazic/tzdata/europe Sat Jun 14 08:08:05 2014 +0100
+++ b/make/sun/javazic/tzdata/europe Fri Jul 04 14:03:26 2014 +0100
@@ -2989,6 +2989,10 @@
# From Alexander Krivenyshev (2014-03-17):
# time change at 2:00 (2am) on March 30, 2014
# http://vz.ru/news/2014/3/17/677464.html
+# From Paul Eggert (2014-03-30):
+# Simferopol and Sevastopol reportedly changed their central town clocks
+# late the previous day, but this appears to have been ceremonial
+# and the discrepancies are small enough to not worry about.
2:00 EU EE%sT 2014 Mar 30 2:00
4:00 - MSK
diff -r 59d534f8c9fb -r a7b38ec2f074 make/sun/security/ec/mapfile-vers
--- a/make/sun/security/ec/mapfile-vers Sat Jun 14 08:08:05 2014 +0100
+++ b/make/sun/security/ec/mapfile-vers Fri Jul 04 14:03:26 2014 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
SUNWprivate_1.1 {
global:
Java_sun_security_ec_ECKeyPairGenerator_generateECKeyPair;
- Java_sun_security_ec_ECKeyPairGenerator_getEncodedBytes;
Java_sun_security_ec_ECDSASignature_signDigest;
Java_sun_security_ec_ECDSASignature_verifySignedDigest;
Java_sun_security_ec_ECDHKeyAgreement_deriveKey;
diff -r 59d534f8c9fb -r a7b38ec2f074 src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java
--- a/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java Sat Jun 14 08:08:05 2014 +0100
+++ b/src/share/classes/com/sun/jmx/remote/security/SubjectDelegator.java Fri Jul 04 14:03:26 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,22 +34,14 @@
import javax.management.remote.SubjectDelegationPermission;
-import com.sun.jmx.remote.util.CacheMap;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.*;
public class SubjectDelegator {
- private static final int PRINCIPALS_CACHE_SIZE = 10;
- private static final int ACC_CACHE_SIZE = 10;
-
- private CacheMap<Subject, Principal[]> principalsCache;
- private CacheMap<Subject, AccessControlContext> accCache;
-
/* Return the AccessControlContext appropriate to execute an
operation on behalf of the delegatedSubject. If the
authenticatedAccessControlContext does not have permission to
delegate to that subject, throw SecurityException. */
- public synchronized AccessControlContext
+ public AccessControlContext
delegatedContext(AccessControlContext authenticatedACC,
Subject delegatedSubject,
boolean removeCallerContext)
@@ -58,56 +50,14 @@
if (System.getSecurityManager() != null && authenticatedACC == null) {
throw new SecurityException("Illegal AccessControlContext: null");
}
- if (principalsCache == null || accCache == null) {
- principalsCache =
- new CacheMap<>(PRINCIPALS_CACHE_SIZE);
- accCache =
- new CacheMap<>(ACC_CACHE_SIZE);
- }
-
- // Retrieve the principals for the given
- // delegated subject from the cache
- //
- Principal[] delegatedPrincipals = principalsCache.get(delegatedSubject);
-
- // Convert the set of principals stored in the
- // delegated subject into an array of principals
- // and store it in the cache
- //
- if (delegatedPrincipals == null) {
- delegatedPrincipals =
- delegatedSubject.getPrincipals().toArray(new Principal[0]);
- principalsCache.put(delegatedSubject, delegatedPrincipals);
- }
-
- // Retrieve the access control context for the
- // given delegated subject from the cache
- //
- AccessControlContext delegatedACC = accCache.get(delegatedSubject);
-
- // Build the access control context to be used
- // when executing code as the delegated subject
- // and store it in the cache
- //
- if (delegatedACC == null) {
- if (removeCallerContext) {
- delegatedACC =
- JMXSubjectDomainCombiner.getDomainCombinerContext(
- delegatedSubject);
- } else {
- delegatedACC =
- JMXSubjectDomainCombiner.getContext(delegatedSubject);
- }
- accCache.put(delegatedSubject, delegatedACC);
- }
// Check if the subject delegation permission allows the
// authenticated subject to assume the identity of each
// principal in the delegated subject
//
- final Principal[] dp = delegatedPrincipals;
- final Collection<Permission> permissions = new ArrayList<>(dp.length);
- for(Principal p : dp) {
+ Collection<Principal> ps = getSubjectPrincipals(delegatedSubject);
+ final Collection<Permission> permissions = new ArrayList<>(ps.size());
+ for(Principal p : ps) {
final String pname = p.getClass().getName() + "." + p.getName();
permissions.add(new SubjectDelegationPermission(pname));
}
@@ -122,7 +72,15 @@
};
AccessController.doPrivileged(action, authenticatedACC);
- return delegatedACC;
+ return getDelegatedAcc(delegatedSubject, removeCallerContext);
+ }
+
+ private AccessControlContext getDelegatedAcc(Subject delegatedSubject, boolean removeCallerContext) {
+ if (removeCallerContext) {
+ return JMXSubjectDomainCombiner.getDomainCombinerContext(delegatedSubject);
+ } else {
+ return JMXSubjectDomainCombiner.getContext(delegatedSubject);
+ }
}
/**
@@ -137,11 +95,9 @@
public static synchronized boolean
checkRemoveCallerContext(Subject subject) {
try {
- final Principal[] dp =
- subject.getPrincipals().toArray(new Principal[0]);
- for (int i = 0 ; i < dp.length ; i++) {
+ for (Principal p : getSubjectPrincipals(subject)) {
final String pname =
- dp[i].getClass().getName() + "." + dp[i].getName();
+ p.getClass().getName() + "." + p.getName();
final Permission sdp =
new SubjectDelegationPermission(pname);
AccessController.checkPermission(sdp);
@@ -151,4 +107,19 @@
}
return true;
}
+
+ /**
+ * Retrieves the {@linkplain Subject} principals
+ * @param subject The subject
+ * @return If the {@code Subject} is immutable it will return the principals directly.
+ * If the {@code Subject} is mutable it will create an unmodifiable copy.
+ */
+ private static Collection<Principal> getSubjectPrincipals(Subject subject) {
+ if (subject.isReadOnly()) {
+ return subject.getPrincipals();
+ }
+
+ List<Principal> principals = Arrays.asList(subject.getPrincipals().toArray(new Principal[0]));
+ return Collections.unmodifiableList(principals);
+ }
}
diff -r 59d534f8c9fb -r a7b38ec2f074 src/share/classes/com/sun/jmx/remote/util/CacheMap.java
--- a/src/share/classes/com/sun/jmx/remote/util/CacheMap.java Sat Jun 14 08:08:05 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-package com.sun.jmx.remote.util;
-
-import java.lang.ref.SoftReference;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.WeakHashMap;
-
-import com.sun.jmx.mbeanserver.Util;
-
-/**
- * <p>Like WeakHashMap, except that the keys of the <em>n</em> most
- * recently-accessed entries are kept as {@link SoftReference soft
- * references}. Accessing an element means creating it, or retrieving
- * it with {@link #get(Object) get}. Because these entries are kept
- * with soft references, they will tend to remain even if their keys
- * are not referenced elsewhere. But if memory is short, they will
- * be removed.</p>
- */
-public class CacheMap<K, V> extends WeakHashMap<K, V> {
- /**
- * <p>Create a <code>CacheMap</code> that can keep up to
- * <code>nSoftReferences</code> as soft references.</p>
- *
- * @param nSoftReferences Maximum number of keys to keep as soft
- * references. Access times for {@link #get(Object) get} and
- * {@link #put(Object, Object) put} have a component that scales
- * linearly with <code>nSoftReferences</code>, so this value
- * should not be too great.
- *
- * @throws IllegalArgumentException if
- * <code>nSoftReferences</code> is negative.
- */
- public CacheMap(int nSoftReferences) {
- if (nSoftReferences < 0) {
- throw new IllegalArgumentException("nSoftReferences = " +
- nSoftReferences);
- }
- this.nSoftReferences = nSoftReferences;
- }
-
- public V put(K key, V value) {
- cache(key);
- return super.put(key, value);
- }
-
- public V get(Object key) {
- cache(Util.<K>cast(key));
- return super.get(key);
- }
-
- /* We don't override remove(Object) or try to do something with
- the map's iterators to detect removal. So we may keep useless
- entries in the soft reference list for keys that have since
- been removed. The assumption is that entries are added to the
- cache but never removed. But the behavior is not wrong if
- they are in fact removed -- the caching is just less
- performant. */
-
- private void cache(K key) {
- Iterator<SoftReference<K>> it = cache.iterator();
- while (it.hasNext()) {
- SoftReference<K> sref = it.next();
- K key1 = sref.get();
- if (key1 == null)
- it.remove();
- else if (key.equals(key1)) {
- // Move this element to the head of the LRU list
- it.remove();
- cache.add(0, sref);
- return;
- }
- }
-
- int size = cache.size();
- if (size == nSoftReferences) {
- if (size == 0)
- return; // degenerate case, equivalent to WeakHashMap
- it.remove();
- }
-
- cache.add(0, new SoftReference<K>(key));
- }
-
- /* List of soft references for the most-recently referenced keys.
- The list is in most-recently-used order, i.e. the first element
- is the most-recently referenced key. There are never more than
- nSoftReferences elements of this list.
-
- If we didn't care about J2SE 1.3 compatibility, we could use
- LinkedHashSet in conjunction with a subclass of SoftReference
- whose equals and hashCode reflect the referent. */
- private final LinkedList<SoftReference<K>> cache =
- new LinkedList<SoftReference<K>>();
- private final int nSoftReferences;
-}
diff -r 59d534f8c9fb -r a7b38ec2f074 src/share/classes/com/sun/security/sasl/CramMD5Base.java
--- a/src/share/classes/com/sun/security/sasl/CramMD5Base.java Sat Jun 14 08:08:05 2014 +0100
+++ b/src/share/classes/com/sun/security/sasl/CramMD5Base.java Fri Jul 04 14:03:26 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,6 +32,7 @@
import java.security.NoSuchAlgorithmException;
import java.security.MessageDigest;
+import java.util.Arrays;
import java.util.logging.Logger;
/**
@@ -159,7 +160,7 @@
MessageDigest md5 = MessageDigest.getInstance("MD5");
/* digest the key if longer than 64 bytes */
- if (key.length > 64) {
+ if (key.length > MD5_BLOCKSIZE) {
key = md5.digest(key);
}
@@ -169,13 +170,9 @@
int i;
/* store key in pads */
- for (i = 0; i < MD5_BLOCKSIZE; i++) {
- for ( ; i < key.length; i++) {
- ipad[i] = key[i];
- opad[i] = key[i];
- }
- ipad[i] = 0x00;
- opad[i] = 0x00;
+ for (i = 0; i < key.length; i++) {
+ ipad[i] = key[i];
+ opad[i] = key[i];
}
/* XOR key with pads */
@@ -207,6 +204,11 @@
}
}
+ Arrays.fill(ipad, (byte)0);
+ Arrays.fill(opad, (byte)0);
+ ipad = null;
+ opad = null;
+
return (digestString.toString());
}
diff -r 59d534f8c9fb -r a7b38ec2f074 src/share/classes/java/awt/Component.java
--- a/src/share/classes/java/awt/Component.java Sat Jun 14 08:08:05 2014 +0100
+++ b/src/share/classes/java/awt/Component.java Fri Jul 04 14:03:26 2014 +0100
@@ -7922,7 +7922,7 @@
res = toFocus.requestFocusInWindow(CausedFocusEvent.Cause.TRAVERSAL_BACKWARD);
}
}
- if (!res) {
+ if (clearOnFailure && !res) {
if (focusLog.isLoggable(PlatformLogger.FINER)) {
focusLog.finer("clear global focus owner");
}
diff -r 59d534f8c9fb -r a7b38ec2f074 src/share/classes/java/awt/KeyboardFocusManager.java
--- a/src/share/classes/java/awt/KeyboardFocusManager.java Sat Jun 14 08:08:05 2014 +0100
+++ b/src/share/classes/java/awt/KeyboardFocusManager.java Fri Jul 04 14:03:26 2014 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -248,15 +248,7 @@
public static void setCurrentKeyboardFocusManager(
KeyboardFocusManager newManager) throws SecurityException
{
- SecurityManager security = System.getSecurityManager();
- if (security != null) {
- if (replaceKeyboardFocusManagerPermission == null) {
- replaceKeyboardFocusManagerPermission =
- new AWTPermission("replaceKeyboardFocusManager");
- }
- security.
- checkPermission(replaceKeyboardFocusManagerPermission);
- }
+ checkReplaceKFMPermission();
More information about the distro-pkg-dev
mailing list