/hg/icedtea6-hg: 8 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jul 30 15:17:51 UTC 2014
changeset 29d6e0e0c2d2 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=29d6e0e0c2d2
author: Jiri Vanek <jvanek at redhat.com>
date: Fri May 09 13:28:18 2014 +0200
Makefile.am: (add-nss-debug.stamp): fixed ECJ_BUILD_OUTPUT_DIR to DEBUG_BUILD_OUTPUT_DIR.
changeset 1da0a61f16a1 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=1da0a61f16a1
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri May 23 02:08:32 2014 +0100
S7027300, RH1098399: Unsynchronized HashMap access causes endless loop
2014-05-22 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/openjdk/7027300-unsync_hashmap_causes_endless_loop.patch:
Backport fix to replace HashMap usage with ConcurrentHashMap,
avoiding deadlock.
changeset 93a1398d268f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=93a1398d268f
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Jun 02 14:48:27 2014 +0100
S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init
S6727719: Performance of TextLayout.getBounds()
S6745225: Memory leak while drawing Attributed String
S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space.
S7183251: Netbeans editor renders text wrong on JDK 7u6 build
2014-05-28 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add new patches.
* NEWS: Updated.
* patches/openjdk/6611637-npe_in_glyphlayout.patch,
* patches/openjdk/6727719-performance_of_textlayout_getbounds.patch,
* patches/openjdk/6745225-memory_leak_in_attributed_string.patch,
* patches/openjdk/6904962-getvisualbounds_affected_by_white_space.patch,
* patches/openjdk/7183251-netbeans_renders_text_wrong.patch:
Backport text layout fixes.
changeset 755d4509b7d6 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=755d4509b7d6
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Thu Jul 24 05:03:40 2014 +0100
Add 1.13.4 release notes.
2014-07-23 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add 1.13.4 release notes.
changeset 0e26048bb9e3 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=0e26048bb9e3
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jul 29 01:20:12 2014 +0100
OJ39: Handle fonts with the non-canonical processing flag set
2014-07-28 Andrew John Hughes <gnu.andrew at redhat.com>
OJ39: Handle fonts with the non-canonical
processing flag set
* Makefile.am:
(ICEDTEA_PATCHES): Add new patch.
* NEWS: Updated.
* patches/openjdk/oj639-handle_fonts_with_no_canon_flag_set.patch:
Sync LETypes.h and LayoutEngine.cpp with 7 versions
in order to support fonts with the no canonical
processing flag.
changeset faaea522af93 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=faaea522af93
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 30 14:41:18 2014 +0100
Update to b32.
2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/jtreg-T6638712-fix.patch,
* patches/jtreg-T6650759m-fix.patch,
* patches/openjdk/6638712-wildcard_types.patch,
* patches/openjdk/6650759-missing_inference.patch:
Remove upstreamed patches.
* Makefile.am:
(OPENJDK_DATE): Update to b32 release date.
(OPENJDK_SHA256SUM): Set to hash of new b32 tarball.
(OPENJDK_VERSION): Set to b32.
(ICEDTEA_PATCHES): Drop removed patches.
* patches/openjdk/6636370-appcontext_simplification.patch:
Regenerated.
* patches/openjdk/6729772-opt_cleanup.patch,
* patches/openjdk/6799141-split_out_versions.patch,
* patches/openjdk/6816311-compiler_name.patch,
* patches/windows-awt.patch:
Remove Windows fragments added upstream.
* patches/openjdk/8013057-detect_mmap_commit_failures.patch:
Remove redundant copyright header change.
changeset 5094b84a8a5c in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5094b84a8a5c
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 30 14:57:43 2014 +0100
Bump to next version, b33.
2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_VERSION): Bump to next release, b33.
changeset f2308ef26cf8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f2308ef26cf8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jul 30 16:17:30 2014 +0100
Drop upstreamed patch.
2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/openjdk/8010213-set_socketoptions_windows.patch:
Remove upstreamed patch.
* Makefile.am:
(ICEDTEA_PATCHES): Drop upstreamed patch.
diffstat:
ChangeLog | 76 +
Makefile.am | 22 +-
NEWS | 47 +
patches/jtreg-T6638712-fix.patch | 30 -
patches/jtreg-T6650759m-fix.patch | 6 -
patches/openjdk/6611637-npe_in_glyphlayout.patch | 21 +
patches/openjdk/6636370-appcontext_simplification.patch | 73 +-
patches/openjdk/6638712-wildcard_types.patch | 563 ------
patches/openjdk/6650759-missing_inference.patch | 884 ----------
patches/openjdk/6727719-performance_of_textlayout_getbounds.patch | 36 +
patches/openjdk/6729772-opt_cleanup.patch | 399 +---
patches/openjdk/6745225-memory_leak_in_attributed_string.patch | 160 +
patches/openjdk/6799141-split_out_versions.patch | 96 +-
patches/openjdk/6816311-compiler_name.patch | 265 +--
patches/openjdk/6904962-getvisualbounds_affected_by_white_space.patch | 129 +
patches/openjdk/7027300-unsync_hashmap_causes_endless_loop.patch | 33 +
patches/openjdk/7183251-netbeans_renders_text_wrong.patch | 24 +
patches/openjdk/8010213-set_socketoptions_windows.patch | 29 -
patches/openjdk/8013057-detect_mmap_commit_failures.patch | 189 +-
patches/openjdk/oj639-handle_fonts_with_no_canon_flag_set.patch | 347 +++
patches/windows-awt.patch | 78 +-
21 files changed, 1209 insertions(+), 2298 deletions(-)
diffs (truncated from 4358 to 500 lines):
diff -r c0295bae714c -r f2308ef26cf8 ChangeLog
--- a/ChangeLog Thu Apr 17 02:40:37 2014 +0100
+++ b/ChangeLog Wed Jul 30 16:17:30 2014 +0100
@@ -1,3 +1,79 @@
+2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/8010213-set_socketoptions_windows.patch:
+ Remove upstreamed patch.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Drop upstreamed patch.
+
+2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b33.
+
+2014-07-30 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/jtreg-T6638712-fix.patch,
+ * patches/jtreg-T6650759m-fix.patch,
+ * patches/openjdk/6638712-wildcard_types.patch,
+ * patches/openjdk/6650759-missing_inference.patch:
+ Remove upstreamed patches.
+ * Makefile.am:
+ (OPENJDK_DATE): Update to b32 release date.
+ (OPENJDK_SHA256SUM): Set to hash of new b32 tarball.
+ (OPENJDK_VERSION): Set to b32.
+ (ICEDTEA_PATCHES): Drop removed patches.
+ * patches/openjdk/6636370-appcontext_simplification.patch:
+ Regenerated.
+ * patches/openjdk/6729772-opt_cleanup.patch,
+ * patches/openjdk/6799141-split_out_versions.patch,
+ * patches/openjdk/6816311-compiler_name.patch,
+ * patches/windows-awt.patch:
+ Remove Windows fragments added upstream.
+ * patches/openjdk/8013057-detect_mmap_commit_failures.patch:
+ Remove redundant copyright header change.
+
+2014-07-28 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ OJ39: Handle fonts with the non-canonical
+ processing flag set
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/openjdk/oj639-handle_fonts_with_no_canon_flag_set.patch:
+ Sync LETypes.h and LayoutEngine.cpp with 7 versions
+ in order to support fonts with the no canonical
+ processing flag.
+
+2014-07-23 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Add 1.13.4 release notes.
+
+2014-05-28 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patches.
+ * NEWS: Updated.
+ * patches/openjdk/6611637-npe_in_glyphlayout.patch,
+ * patches/openjdk/6727719-performance_of_textlayout_getbounds.patch,
+ * patches/openjdk/6745225-memory_leak_in_attributed_string.patch,
+ * patches/openjdk/6904962-getvisualbounds_affected_by_white_space.patch,
+ * patches/openjdk/7183251-netbeans_renders_text_wrong.patch:
+ Backport text layout fixes.
+
+2014-05-22 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add new patch.
+ * NEWS: Updated.
+ * patches/openjdk/7027300-unsync_hashmap_causes_endless_loop.patch:
+ Backport fix to replace HashMap usage with ConcurrentHashMap,
+ avoiding deadlock.
+
+2014-05-09 Jiri Vanek <jvanek at redhat.com>
+
+ * Makefile.am: (add-nss-debug.stamp): fixed ECJ_BUILD_OUTPUT_DIR
+ to DEBUG_BUILD_OUTPUT_DIR.
+
2014-04-16 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS:
diff -r c0295bae714c -r f2308ef26cf8 Makefile.am
--- a/Makefile.am Thu Apr 17 02:40:37 2014 +0100
+++ b/Makefile.am Wed Jul 30 16:17:30 2014 +0100
@@ -1,8 +1,8 @@
# Dependencies
-OPENJDK_DATE = 15_apr_2014
-OPENJDK_SHA256SUM = 362d9bf20e91393b52dd0513896d39831cf320c49bd4bf1e28124f21569b72eb
-OPENJDK_VERSION = b31
+OPENJDK_DATE = 15_jul_2014
+OPENJDK_SHA256SUM = 1a7404f38b3fa7cbb25d4273c0d94885912badd3343c5184c3b0947437501256
+OPENJDK_VERSION = b33
OPENJDK_URL = https://java.net/downloads/openjdk6/
CACAO_VERSION = 68fe50ac34ec
@@ -374,12 +374,8 @@
patches/ipv4-mapped-ipv6-addresses.patch \
patches/jtreg-OpenGLContextInit.patch \
patches/openjdk/6510892-httpserver_test.patch \
- patches/openjdk/6638712-wildcard_types.patch \
- patches/openjdk/6650759-missing_inference.patch \
patches/jtreg-international-fonts.patch \
patches/f14-fonts.patch \
- patches/jtreg-T6638712-fix.patch \
- patches/jtreg-T6650759m-fix.patch \
patches/openjdk/7003777-bad-html-entity-parse.patch \
patches/rendering-engine-tests.patch \
patches/openjdk/6800846-printing-quality.patch \
@@ -500,7 +496,6 @@
patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch \
patches/openjdk/8009217-fix_test_compile.patch \
patches/openjdk/8009610-blacklist_malware_certificate.patch \
- patches/openjdk/8010213-set_socketoptions_windows.patch \
patches/openjdk/8010714-xml_dsig_retrievalmethod.patch \
patches/openjdk/8011154-awt_regression.patch \
patches/openjdk/8011313-OCSP_timeout_wrong_value.patch \
@@ -614,7 +609,14 @@
patches/shark-drop_compile_method_arg_following_7083786.patch \
patches/openjdk/7151089-numa_should_not_free_shm_large_pages.patch \
patches/openjdk/8013057-detect_mmap_commit_failures.patch \
- patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch
+ patches/openjdk/8026887-make_large_page_allocations_easier_to_debug.patch \
+ patches/openjdk/7027300-unsync_hashmap_causes_endless_loop.patch \
+ patches/openjdk/7183251-netbeans_renders_text_wrong.patch \
+ patches/openjdk/6904962-getvisualbounds_affected_by_white_space.patch \
+ patches/openjdk/6611637-npe_in_glyphlayout.patch \
+ patches/openjdk/6727719-performance_of_textlayout_getbounds.patch \
+ patches/openjdk/6745225-memory_leak_in_attributed_string.patch \
+ patches/openjdk/oj639-handle_fonts_with_no_canon_flag_set.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -1918,7 +1920,7 @@
rm -f stamps/add-nss-debug.stamp.tmp
touch stamps/add-nss-debug.stamp.tmp
all_patches_ok=yes; \
- for dir in $(ECJ_BUILD_OUTPUT_DIR)/{j2sdk-image/jre,j2re-image} ; \
+ for dir in $(DEBUG_BUILD_OUTPUT_DIR)/{j2sdk-image/jre,j2re-image} ; \
do \
pushd $$dir ; \
cp -v $$dir/lib/security/java.security{,.old} ; \
diff -r c0295bae714c -r f2308ef26cf8 NEWS
--- a/NEWS Thu Apr 17 02:40:37 2014 +0100
+++ b/NEWS Wed Jul 30 16:17:30 2014 +0100
@@ -15,9 +15,56 @@
New in release 1.14.0 (201X-XX-XX):
* Backports
+ - S6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init
+ - S6727719: Performance of TextLayout.getBounds()
+ - S6745225: Memory leak while drawing Attributed String
+ - S6904962: GlyphVector.getVisualBounds should not be affected by leading or trailing white space.
- S7151089: PS NUMA: NUMA allocator should not attempt to free pages when using SHM large pages
- S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
- S8026887: Make issues due to failed large pages allocations easier to debug
+ - OJ39: Handle fonts with the non-canonical processing flag set
+
+New in release 1.13.4 (2014-07-15):
+
+* Security fixes
+ - S8029755, CVE-2014-4209: Enhance subject class
+ - S8030763: Validate global memory allocation
+ - S8031346, CVE-2014-4244: Enhance RSA key handling
+ - S8031540: Introduce document horizon
+ - S8032536: JVM resolves wrong method in some unusual cases
+ - S8033055: Issues in 2d
+ - S8033301, CVE-2014-4266: Build more informative InfoBuilder
+ - S8034267: Probabilistic native crash
+ - S8034272: Do not cram data into CRAM arrays
+ - S8035004, CVE-2014-4252: Provider provides less service
+ - S8035009, CVE-2014-4218: Make Proxy representations consistent
+ - S8035119, CVE-2014-4219: Fix exceptions to bytecode verification
+ - S8035699, CVE-2014-4268: File choosers should be choosier
+ - S8036571: (process) Process process arguments carefully
+ - S8036800: Attribute OOM to correct part of code
+ - S8037046: Validate libraries to be loaded
+ - S8037157: Verify <init> call
+ - S8037076, CVE-2014-2490: Check constant pool constants
+ - S8037162, CVE-2014-4263: More robust DH exchanges
+ - S8037167, CVE-2014-4216: Better method signature resolution
+ - S8039520, CVE-2014-4262: More atomicity of atomic updates
+* Import of OpenJDK6 b32
+ - OJ32: OpenJDK6-b31 isn't compatible with Windows platform
+ - OJ33: Update copyright headers introduced by the fix for OPENJDK6-32
+ - OJ34: OpenJDK6-b31 backport of JDK-6638712 to openjdk6
+ - OJ35: backport of JDK-6650759 to openjdk6
+ - OJ36: Fix a mistake in backport of 8035119
+ - S8013611: Modal dialog fails to obtain keyboard focus
+ - S8013836: getFirstDayOfWeek reports wrong day for pt-BR locale
+ - S8028111: XML readers share the same entity expansion counter
+ - S8028285: RMI Thread can no longer call out to AWT
+ - S8029038: Revise fix for XML readers share the same entity expansion counter
+ - S8042582: Test java/awt/KeyboardFocusmanager/ChangeKFMTest/ChangeKFMTest.html fails on Windows x64
+ - S8042590: Running form URL throws NPE
+ - S8042789: org.omg.CORBA.ORBSingletonClass loading no longer uses context class loader
+* Backports
+ - S7027300, RH1098399: Unsynchronized HashMap access causes endless loop
+ - S7183251: Netbeans editor renders text wrong on JDK 7u6 build
New in release 1.13.3 (2014-04-15):
diff -r c0295bae714c -r f2308ef26cf8 patches/jtreg-T6638712-fix.patch
--- a/patches/jtreg-T6638712-fix.patch Thu Apr 17 02:40:37 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
---- openjdk-old/langtools/test/tools/javac/generics/inference/6638712/T6638712a.out 2010-11-30 14:44:29.000000000 +0100
-+++ openjdk/langtools/test/tools/javac/generics/inference/6638712/T6638712a.out 2010-11-30 15:27:57.000000000 +0100
-@@ -1,2 +1,2 @@
--T6638712a.java:39:41: compiler.err.invalid.inferred.types: T, (- compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
-+T6638712a.java:16:41: compiler.err.invalid.inferred.types: T, (- compiler.misc.inferred.do.not.conform.to.params: java.lang.Iterable<? extends java.util.Comparator<? super java.lang.String>>, java.util.List<java.util.Comparator<?>>)
- 1 error
---- openjdk-old/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out 2010-11-30 14:44:29.000000000 +0100
-+++ openjdk/langtools/test/tools/javac/generics/inference/6638712/T6638712b.out 2010-11-30 15:27:58.000000000 +0100
-@@ -1,2 +1,2 @@
--T6638712b.java:37:21: compiler.err.prob.found.req: (- compiler.misc.incompatible.types.1: (- compiler.misc.no.conforming.instance.exists: T, T, java.lang.String)), <T>T, java.lang.String
-+T6638712b.java:14:21: compiler.err.prob.found.req: (- compiler.misc.incompatible.types.1: (- compiler.misc.no.conforming.instance.exists: T, T, java.lang.String)), <T>T, java.lang.String
- 1 error
---- openjdk-old/langtools/test/tools/javac/generics/inference/6638712/T6638712c.out 2010-11-30 14:44:29.000000000 +0100
-+++ openjdk/langtools/test/tools/javac/generics/inference/6638712/T6638712c.out 2010-11-30 15:27:59.000000000 +0100
-@@ -1,2 +1,2 @@
--T6638712c.java:39:9: compiler.err.cant.apply.symbol: <T>sort(T[],java.util.Comparator<? super T>), T6638712c, , java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, null
-+T6638712c.java:16:9: compiler.err.cant.apply.symbol: <T>sort(T[],java.util.Comparator<? super T>), T6638712c, , java.lang.Enum[],java.util.Comparator<java.lang.Enum<?>>, null
- 1 error
---- openjdk-old/langtools/test/tools/javac/generics/inference/6638712/T6638712d.out 2010-11-30 14:44:29.000000000 +0100
-+++ openjdk/langtools/test/tools/javac/generics/inference/6638712/T6638712d.out 2010-11-30 15:28:01.000000000 +0100
-@@ -1,2 +1,2 @@
--T6638712d.java:39:9: compiler.err.cant.apply.symbol: <U>m(U,java.util.List<java.util.List<U>>), T6638712d, , int,java.util.List<java.util.List<java.lang.String>>, null
-+T6638712d.java:16:9: compiler.err.cant.apply.symbol: <U>m(U,java.util.List<java.util.List<U>>), T6638712d, , int,java.util.List<java.util.List<java.lang.String>>, null
- 1 error
---- openjdk-old/langtools/test/tools/javac/generics/inference/6638712/T6638712e.out 2010-11-30 14:44:29.000000000 +0100
-+++ openjdk/langtools/test/tools/javac/generics/inference/6638712/T6638712e.out 2010-11-30 15:28:02.000000000 +0100
-@@ -1,2 +1,2 @@
--T6638712e.java:40:27: compiler.err.prob.found.req: (- compiler.misc.incompatible.types.1: (- compiler.misc.no.conforming.instance.exists: X, T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>)), <X>T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>
-+T6638712e.java:17:27: compiler.err.prob.found.req: (- compiler.misc.incompatible.types.1: (- compiler.misc.no.conforming.instance.exists: X, T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>)), <X>T6638712e.Foo<X,java.lang.String>, T6638712e.Foo<java.lang.Object,java.lang.String>
- 1 error
diff -r c0295bae714c -r f2308ef26cf8 patches/jtreg-T6650759m-fix.patch
--- a/patches/jtreg-T6650759m-fix.patch Thu Apr 17 02:40:37 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
---- openjdk-old/langtools/test/tools/javac/generics/inference/6650759/T6650759m.out 2010-12-03 16:08:35.000000000 +0100
-+++ openjdk/langtools/test/tools/javac/generics/inference/6650759/T6650759m.out 2010-12-03 16:12:08.000000000 +0100
-@@ -1,2 +1,2 @@
--T6650759m.java:43:36: compiler.err.prob.found.req: (compiler.misc.incompatible.types), java.util.List<? super java.lang.Integer>, java.util.List<? super java.lang.String>
-+T6650759m.java:43:36: compiler.err.prob.found.req: (- compiler.misc.incompatible.types), java.util.List<? super java.lang.Integer>, java.util.List<? super java.lang.String>
- 1 error
diff -r c0295bae714c -r f2308ef26cf8 patches/openjdk/6611637-npe_in_glyphlayout.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6611637-npe_in_glyphlayout.patch Wed Jul 30 16:17:30 2014 +0100
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User prr
+# Date 1211221532 25200
+# Mon May 19 11:25:32 2008 -0700
+# Node ID 075152aa892eda98de7530b761bb347e44a58ba6
+# Parent bf2c66511d1bf7c2a4d04b3f8bda635466abae44
+6611637: NullPointerException in sun.font.GlyphLayout$EngineRecord.init
+Reviewed-by: tdv, jgodinez
+
+diff -r bf2c66511d1b -r 075152aa892e src/share/classes/sun/font/GlyphLayout.java
+--- openjdk/jdk/src/share/classes/sun/font/GlyphLayout.java Fri May 16 03:10:58 2008 +0400
++++ openjdk/jdk/src/share/classes/sun/font/GlyphLayout.java Mon May 19 11:25:32 2008 -0700
+@@ -85,7 +85,7 @@
+ private GVData _gvdata;
+
+ // cached glyph layout data for reuse
+- private static GlyphLayout cache; // reusable
++ private static volatile GlyphLayout cache; // reusable
+
+ private LayoutEngineFactory _lef; // set when get is called, unset when done is called
+ private TextRecord _textRecord; // the text we're working on, used by iterators
diff -r c0295bae714c -r f2308ef26cf8 patches/openjdk/6636370-appcontext_simplification.patch
--- a/patches/openjdk/6636370-appcontext_simplification.patch Thu Apr 17 02:40:37 2014 +0100
+++ b/patches/openjdk/6636370-appcontext_simplification.patch Wed Jul 30 16:17:30 2014 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/src/share/classes/sun/awt/AppContext.java openjdk/jdk/src/share/classes/sun/awt/AppContext.java
---- openjdk.orig/jdk/src/share/classes/sun/awt/AppContext.java 2013-08-05 16:49:37.120128300 +0100
-+++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java 2013-08-05 17:02:51.304664462 +0100
+--- openjdk.orig/jdk/src/share/classes/sun/awt/AppContext.java 2014-07-30 05:35:13.829679786 +0100
++++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java 2014-07-30 05:41:13.086698718 +0100
@@ -151,7 +151,7 @@
contained in another AppContext. It is implicitly created for
standalone apps only (i.e. not applets)
@@ -71,58 +71,17 @@
// Special case: we implicitly create the main app context
// if no contexts have been created yet. This covers standalone apps
-@@ -308,28 +297,29 @@
- }
- }
+@@ -338,8 +327,7 @@
+ }
-- AppContext context = threadGroup2appContext.get(threadGroup);
-- while (context == null) {
-- threadGroup = threadGroup.getParent();
-- if (threadGroup == null) {
-- return null;
-+ AppContext context = threadGroup2appContext.get(threadGroup);
-+ while (context == null) {
-+ threadGroup = threadGroup.getParent();
-+ if (threadGroup == null) {
-+ return null;
-+ }
-+ context = threadGroup2appContext.get(threadGroup);
-+ }
-+
-+ // In case we did anything in the above while loop, we add
-+ // all the intermediate ThreadGroups to threadGroup2appContext
-+ // so we won't spin again.
-+ for (ThreadGroup tg = currentThreadGroup; tg != threadGroup; tg = tg.getParent()) {
-+ threadGroup2appContext.put(tg, context);
-+ }
-+
-+ // Now we're done, so we cache the latest key/value pair.
-+ threadAppContext.set(context);
-+
-+
-+ return context;
- }
-- context = threadGroup2appContext.get(threadGroup);
-- }
-- // In case we did anything in the above while loop, we add
-- // all the intermediate ThreadGroups to threadGroup2appContext
-- // so we won't spin again.
-- for (ThreadGroup tg = currentThreadGroup; tg != threadGroup; tg = tg.getParent()) {
-- threadGroup2appContext.put(tg, context);
-- }
--
-- // Now we're done, so we cache the latest key/value pair.
+ // Now we're done, so we cache the latest key/value pair.
- mostRecentThreadAppContext =
- new MostRecentThreadAppContext(currentThread, context);
--
-- return context;
-- }
-- });
-+ });
- }
++ threadAppContext.set(context);
- return appContext;
-@@ -473,7 +463,7 @@
+ return context;
+ }
+@@ -487,7 +475,7 @@
// Threads in the ThreadGroup to exit.
long startTime = System.currentTimeMillis();
@@ -131,7 +90,7 @@
while ((this.threadGroup.activeCount() > 0) &&
(System.currentTimeMillis() < endTime)) {
try {
-@@ -488,7 +478,7 @@
+@@ -502,7 +490,7 @@
// Threads in the ThreadGroup to die.
startTime = System.currentTimeMillis();
@@ -140,7 +99,7 @@
while ((this.threadGroup.activeCount() > 0) &&
(System.currentTimeMillis() < endTime)) {
try {
-@@ -507,10 +497,7 @@
+@@ -521,10 +509,7 @@
}
threadGroup2appContext.remove(this.threadGroup);
@@ -152,15 +111,7 @@
// Finally, we destroy the ThreadGroup entirely.
try {
-@@ -693,6 +680,7 @@
- * Returns a string representation of this AppContext.
- * @since 1.2
- */
-+ @Override
- public String toString() {
- return getClass().getName() + "[threadGroup=" + threadGroup.getName() + "]";
- }
-@@ -842,15 +830,6 @@
+@@ -856,15 +842,6 @@
}
}
diff -r c0295bae714c -r f2308ef26cf8 patches/openjdk/6638712-wildcard_types.patch
--- a/patches/openjdk/6638712-wildcard_types.patch Thu Apr 17 02:40:37 2014 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,563 +0,0 @@
-# HG changeset patch
-# User mcimadamore
-# Date 1284137253 -3600
-# Node ID c5fe15e03287286fa8e668798409c4d7493ee834
-# Parent 27f03394a69d018c1c2badadee65ea39c7274606
-6638712: Inference with wildcard types causes selection of inapplicable method
-Summary: Added global sanity check in order to make sure that return type inference does not violate bounds constraints
-Reviewed-by: jjg
-
-diff -r 27f03394a69d -r c5fe15e03287 src/share/classes/com/sun/tools/javac/code/Type.java
---- openjdk.orig/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Wed Jun 23 16:44:15 2010 -0700
-+++ openjdk/langtools/src/share/classes/com/sun/tools/javac/code/Type.java Fri Sep 10 17:47:33 2010 +0100
-@@ -1061,6 +1061,21 @@
- return qtype.isErroneous();
- }
-
-+ /**
-+ * Replaces this ForAll's typevars with a set of concrete Java types
-+ * and returns the instantiated generic type. Subclasses might override
-+ * in order to check that the list of types is a valid instantiation
-+ * of the ForAll's typevars.
-+ *
-+ * @param actuals list of actual types
-+ * @param types types instance
-+ * @return qtype where all occurrences of tvars are replaced
-+ * by types in actuals
-+ */
-+ public Type inst(List<Type> actuals, Types types) {
-+ return types.subst(qtype, tvars, actuals);
-+ }
-+
- public Type map(Mapping f) {
- return f.apply(qtype);
- }
-diff -r 27f03394a69d -r c5fe15e03287 src/share/classes/com/sun/tools/javac/code/Types.java
---- openjdk.orig/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Wed Jun 23 16:44:15 2010 -0700
-+++ openjdk/langtools/src/share/classes/com/sun/tools/javac/code/Types.java Fri Sep 10 17:47:33 2010 +0100
-@@ -331,6 +331,14 @@
- if (s.tag >= firstPartialTag)
- return isSuperType(s, t);
-
-+ if (s.isCompound()) {
-+ for (Type s2 : interfaces(s).prepend(supertype(s))) {
-+ if (!isSubtype(t, s2, capture))
-+ return false;
-+ }
-+ return true;
-+ }
-+
- Type lower = lowerBound(s);
- if (s != lower)
- return isSubtype(capture ? capture(t) : t, lower, false);
-@@ -2766,6 +2774,14 @@
- /**
- * Capture conversion as specified by JLS 3rd Ed.
- */
-+
-+ public List<Type> capture(List<Type> ts) {
-+ List<Type> buf = List.nil();
-+ for (Type t : ts) {
-+ buf = buf.prepend(capture(t));
-+ }
-+ return buf.reverse();
-+ }
- public Type capture(Type t) {
- if (t.tag != CLASS)
- return t;
-diff -r 27f03394a69d -r c5fe15e03287 src/share/classes/com/sun/tools/javac/comp/Check.java
---- openjdk.orig/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Wed Jun 23 16:44:15 2010 -0700
-+++ openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/Check.java Fri Sep 10 17:47:33 2010 +0100
-@@ -383,6 +383,10 @@
- JCDiagnostic.fragment("incompatible.types" + (d!=null ? ".1" : ""), d),
- t, pt);
- }
-+ } catch (Infer.InvalidInstanceException ex) {
-+ JCDiagnostic d = ex.getDiagnostic();
-+ log.error(pos, "invalid.inferred.types", t.tvars, d);
-+ return syms.errType;
- }
- }
- }
-diff -r 27f03394a69d -r c5fe15e03287 src/share/classes/com/sun/tools/javac/comp/Infer.java
---- openjdk.orig/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Wed Jun 23 16:44:15 2010 -0700
-+++ openjdk/langtools/src/share/classes/com/sun/tools/javac/comp/Infer.java Fri Sep 10 17:47:33 2010 +0100
-@@ -29,6 +29,7 @@
- import com.sun.tools.javac.util.List;
- import com.sun.tools.javac.code.*;
- import com.sun.tools.javac.code.Type.*;
-+import com.sun.tools.javac.code.Symbol.*;
-
- import static com.sun.tools.javac.code.Flags.*;
- import static com.sun.tools.javac.code.Kinds.*;
-@@ -50,6 +51,7 @@
-
- Symtab syms;
- Types types;
-+ Resolve rs;
-
- public static Infer instance(Context context) {
- Infer instance = context.get(inferKey);
-@@ -62,43 +64,51 @@
- context.put(inferKey, this);
- syms = Symtab.instance(context);
- types = Types.instance(context);
-+ rs = Resolve.instance(context);
- }
-
-- public static class NoInstanceException extends RuntimeException {
-+ public static class InferenceException extends RuntimeException {
- private static final long serialVersionUID = 0;
More information about the distro-pkg-dev
mailing list