/hg/icedtea6-hg: 6 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Feb 13 15:54:26 PST 2013
changeset 9cda95ffca83 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9cda95ffca83
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Feb 13 18:16:50 2013 +0000
Include latest security fixes.
2013-02-13 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am: Add latest security fixes.
* patches/openjdk/6633275-shaped_translucent_windows.patch,
* patches/openjdk/7162902-corba_fixes.patch:
Regenerated against new fixes.
* patches/security/20130201/6563318.patch,
* patches/security/20130201/6664509.patch,
* patches/security/20130201/6776941.patch,
* patches/security/20130201/7141694.patch,
* patches/security/20130201/7173145.patch,
* patches/security/20130201/7186945.patch,
* patches/security/20130201/7186948.patch,
* patches/security/20130201/7186952.patch,
* patches/security/20130201/7186954.patch,
* patches/security/20130201/7192392.patch,
* patches/security/20130201/7192393.patch,
* patches/security/20130201/7192977.patch,
* patches/security/20130201/7197546.patch,
* patches/security/20130201/7200491.patch,
* patches/security/20130201/7200500.patch,
* patches/security/20130201/7201064.patch,
* patches/security/20130201/7201066.patch,
* patches/security/20130201/7201068.patch,
* patches/security/20130201/7201070.patch,
* patches/security/20130201/7201071.patch,
* patches/security/20130201/8000210.patch,
* patches/security/20130201/8000537.patch,
* patches/security/20130201/8000540.patch,
* patches/security/20130201/8000631.patch,
* patches/security/20130201/8001235.patch,
* patches/security/20130201/8001242.patch,
* patches/security/20130201/8001307.patch,
* patches/security/20130201/8001972.patch,
* patches/security/20130201/8002325.patch:
Include new fixes.
changeset 55c6b6c6e0af in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=55c6b6c6e0af
author: Omair Majid <omajid at redhat.com>
date: Mon Feb 04 00:59:08 2013 -0500
S7010849: 5/5 Extraneous javac source/target options when building sa-jdi
2013-02-04 Andrew John Hughes <gnu.andrew at redhat.com>
Omair Majid <omajid at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add 7010849 backport.
(ICEDTEA_ECJ_PATCHES): Remove 7010849 backport.
* patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch: Rename to ...
* patches/openjdk/7010849-modernise_sa.patch: New file.
changeset 7b540332f735 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7b540332f735
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Feb 13 18:24:03 2013 +0000
Fix regressions caused by security patches.
S8004341: Two JCK tests fails with 7u11 b06
S8005615: Java Logger fails to load tomcat logger implementation (JULI)
2013-02-08 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add additional patches to
fix regressions introduced by security fixes
6664509 & 7201064.
* patches/openjdk/8004341-jck_dialog_failure.patch:
Fix issue with Dialog serialization.
* patches/openjdk/8005615-failure_to_load_logger_implementation.patch:
Fix issue with use of custom LogManagers.
changeset c3ecc5528bc0 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=c3ecc5528bc0
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Feb 13 18:25:21 2013 +0000
PR1297: cacao and jamvm parallel unpack failures
2013-02-08 Andrew John Hughes <gnu.andrew at redhat.com>
PR1297: cacao and jamvm parallel unpack failures
* Makefile.am:
Add aliases for extract-cacao and extract-jamvm.
(extract-cacao): Depend on download-cacao.
(extract-jamvm): Depend on download-jamvm.
changeset 7d578c967e3d in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7d578c967e3d
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Feb 13 18:26:57 2013 +0000
PR1301: PR1171 causes Zero builds to fail
2013-02-08 Andrew John Hughes <gnu.andrew at redhat.com>
PR1301: PR1171 causes Zero builds to fail
* Makefile.am:
(add-archive): Don't run -Xshare:dump if building
Zero.
(add-archive-debug): Likewise.
(add-archive-ecj): Likewise.
changeset 55720644035f in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=55720644035f
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 13 23:54:10 2013 +0000
Merge
diffstat:
ChangeLog | 117 +
Makefile.am | 53 +-
NEWS | 1 +
patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch | 394 -
patches/openjdk/6633275-shaped_translucent_windows.patch | 230 +-
patches/openjdk/7010849-modernise_sa.patch | 394 +
patches/openjdk/7162902-corba_fixes.patch | 107 +-
patches/openjdk/8004341-jck_dialog_failure.patch | 26 +
patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 +
patches/security/20130201/6563318.patch | 36 +
patches/security/20130201/6664509.patch | 1322 +
patches/security/20130201/6776941.patch | 272 +
patches/security/20130201/7141694.patch | 87 +
patches/security/20130201/7173145.patch | 22 +
patches/security/20130201/7186945.patch | 10819 ++++++++++
patches/security/20130201/7186948.patch | 20 +
patches/security/20130201/7186952.patch | 127 +
patches/security/20130201/7186954.patch | 81 +
patches/security/20130201/7192392.patch | 695 +
patches/security/20130201/7192393.patch | 60 +
patches/security/20130201/7192977.patch | 444 +
patches/security/20130201/7197546.patch | 479 +
patches/security/20130201/7200491.patch | 49 +
patches/security/20130201/7200500.patch | 60 +
patches/security/20130201/7201064.patch | 125 +
patches/security/20130201/7201066.patch | 66 +
patches/security/20130201/7201068.patch | 83 +
patches/security/20130201/7201070.patch | 31 +
patches/security/20130201/7201071.patch | 553 +
patches/security/20130201/8000210.patch | 104 +
patches/security/20130201/8000537.patch | 334 +
patches/security/20130201/8000540.patch | 187 +
patches/security/20130201/8000631.patch | 3964 +++
patches/security/20130201/8001235.patch | 36 +
patches/security/20130201/8001242.patch | 61 +
patches/security/20130201/8001307.patch | 27 +
patches/security/20130201/8001972.patch | 438 +
patches/security/20130201/8002325.patch | 59 +
38 files changed, 21933 insertions(+), 572 deletions(-)
diffs (truncated from 23336 to 500 lines):
diff -r d8acef41b7b6 -r 55720644035f ChangeLog
--- a/ChangeLog Wed Jan 30 00:52:15 2013 +0000
+++ b/ChangeLog Wed Feb 13 23:54:10 2013 +0000
@@ -1,3 +1,115 @@
+2013-02-08 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR1301: PR1171 causes Zero builds to fail
+ * Makefile.am:
+ (add-archive): Don't run -Xshare:dump if building
+ Zero.
+ (add-archive-debug): Likewise.
+ (add-archive-ecj): Likewise.
+
+2013-02-08 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR1297: cacao and jamvm parallel unpack failures
+ * Makefile.am:
+ Add aliases for extract-cacao and extract-jamvm.
+ (extract-cacao): Depend on download-cacao.
+ (extract-jamvm): Depend on download-jamvm.
+
+2013-02-08 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add additional patches to
+ fix regressions introduced by security fixes
+ 6664509 & 7201064.
+ * patches/openjdk/8004341-jck_dialog_failure.patch:
+ Fix issue with Dialog serialization.
+ * patches/openjdk/8005615-failure_to_load_logger_implementation.patch:
+ Fix issue with use of custom LogManagers.
+
+2013-02-04 Andrew John Hughes <gnu.andrew at redhat.com>
+ Omair Majid <omajid at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Add 7010849 backport.
+ (ICEDTEA_ECJ_PATCHES): Remove 7010849 backport.
+ * patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch: Rename to ...
+ * patches/openjdk/7010849-modernise_sa.patch: New file.
+
+2013-02-13 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am: Add latest security fixes.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch,
+ * patches/openjdk/7162902-corba_fixes.patch:
+ Regenerated against new fixes.
+ * patches/security/20130201/6563318.patch,
+ * patches/security/20130201/6664509.patch,
+ * patches/security/20130201/6776941.patch,
+ * patches/security/20130201/7141694.patch,
+ * patches/security/20130201/7173145.patch,
+ * patches/security/20130201/7186945.patch,
+ * patches/security/20130201/7186948.patch,
+ * patches/security/20130201/7186952.patch,
+ * patches/security/20130201/7186954.patch,
+ * patches/security/20130201/7192392.patch,
+ * patches/security/20130201/7192393.patch,
+ * patches/security/20130201/7192977.patch,
+ * patches/security/20130201/7197546.patch,
+ * patches/security/20130201/7200491.patch,
+ * patches/security/20130201/7200500.patch,
+ * patches/security/20130201/7201064.patch,
+ * patches/security/20130201/7201066.patch,
+ * patches/security/20130201/7201068.patch,
+ * patches/security/20130201/7201070.patch,
+ * patches/security/20130201/7201071.patch,
+ * patches/security/20130201/8000210.patch,
+ * patches/security/20130201/8000537.patch,
+ * patches/security/20130201/8000540.patch,
+ * patches/security/20130201/8000631.patch,
+ * patches/security/20130201/8001235.patch,
+ * patches/security/20130201/8001242.patch,
+ * patches/security/20130201/8001307.patch,
+ * patches/security/20130201/8001972.patch,
+ * patches/security/20130201/8002325.patch:
+ Include new fixes.
+
+2013-02-01 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (SECURITY_PATCHES): Add latest batch.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch:
+ Regenerated against security patches.
+ * patches/security/20120612/7145239.patch,
+ * patches/security/20130201/6563318.patch,
+ * patches/security/20130201/6664509.patch,
+ * patches/security/20130201/6776941.patch,
+ * patches/security/20130201/7141694.patch,
+ * patches/security/20130201/7173145.patch,
+ * patches/security/20130201/7186945.patch,
+ * patches/security/20130201/7186948.patch,
+ * patches/security/20130201/7186952.patch,
+ * patches/security/20130201/7186954.patch,
+ * patches/security/20130201/7192392.patch,
+ * patches/security/20130201/7192393.patch,
+ * patches/security/20130201/7192977.patch,
+ * patches/security/20130201/7197546.patch,
+ * patches/security/20130201/7200491.patch,
+ * patches/security/20130201/7200500.patch,
+ * patches/security/20130201/7201064.patch,
+ * patches/security/20130201/7201066.patch,
+ * patches/security/20130201/7201068.patch,
+ * patches/security/20130201/7201070.patch,
+ * patches/security/20130201/7201071.patch,
+ * patches/security/20130201/8000210.patch,
+ * patches/security/20130201/8000537.patch,
+ * patches/security/20130201/8000540.patch,
+ * patches/security/20130201/8000631.patch,
+ * patches/security/20130201/8001235.patch,
+ * patches/security/20130201/8001242.patch,
+ * patches/security/20130201/8001307.patch,
+ * patches/security/20130201/8001972.patch,
+ * patches/security/20130201/8002325.patch:
+ New security patches for 2013/02/01 errata.
+
2013-01-29 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add missing bug ID.
@@ -315,6 +427,11 @@
2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b28.
+
+2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
+
* generated/com/sun/corba/se/impl/logging/ActivationSystemException.java,
* generated/com/sun/corba/se/impl/logging/IORSystemException.java,
* generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java,
diff -r d8acef41b7b6 -r 55720644035f Makefile.am
--- a/Makefile.am Wed Jan 30 00:52:15 2013 +0000
+++ b/Makefile.am Wed Feb 13 23:54:10 2013 +0000
@@ -2,7 +2,7 @@
OPENJDK_DATE = 26_oct_2012
OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0
-OPENJDK_VERSION = b27
+OPENJDK_VERSION = b28
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = 68fe50ac34ec
@@ -245,7 +245,36 @@
ICEDTEA_FSG_PATCHES =
SECURITY_PATCHES = \
- patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch
+ patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
+ patches/security/20130201/7201068.patch \
+ patches/security/20130201/6563318.patch \
+ patches/security/20130201/6664509.patch \
+ patches/security/20130201/6776941.patch \
+ patches/security/20130201/7141694.patch \
+ patches/security/20130201/7173145.patch \
+ patches/security/20130201/7186945.patch \
+ patches/security/20130201/7186948.patch \
+ patches/security/20130201/7186952.patch \
+ patches/security/20130201/7186954.patch \
+ patches/security/20130201/7192392.patch \
+ patches/security/20130201/7192393.patch \
+ patches/security/20130201/7192977.patch \
+ patches/security/20130201/7197546.patch \
+ patches/security/20130201/7200491.patch \
+ patches/security/20130201/7200500.patch \
+ patches/security/20130201/7201064.patch \
+ patches/security/20130201/7201066.patch \
+ patches/security/20130201/7201070.patch \
+ patches/security/20130201/7201071.patch \
+ patches/security/20130201/8000210.patch \
+ patches/security/20130201/8000537.patch \
+ patches/security/20130201/8000540.patch \
+ patches/security/20130201/8000631.patch \
+ patches/security/20130201/8001242.patch \
+ patches/security/20130201/8001307.patch \
+ patches/security/20130201/8001972.patch \
+ patches/security/20130201/8002325.patch \
+ patches/security/20130201/8001235.patch
SPECIAL_SECURITY_PATCH = patches/security/20120214/7112642.patch
@@ -470,7 +499,10 @@
patches/openjdk/6763340-corba_memory_leak.patch \
patches/openjdk/6980681-corba_deadlock.patch \
patches/openjdk/7162902-corba_fixes.patch \
- patches/traceable.patch
+ patches/traceable.patch \
+ patches/openjdk/7010849-modernise_sa.patch \
+ patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
+ patches/openjdk/8004341-jck_dialog_failure.patch
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -527,7 +559,6 @@
# Bootstrapping patches
ICEDTEA_ECJ_PATCHES = \
- patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch \
patches/ecj/icedtea.patch \
patches/ecj/javafiles.patch \
patches/ecj/spp.patch \
@@ -1099,7 +1130,7 @@
rm -f stamps/patch-fsg.stamp
rm -f stamps/patch.stamp
-stamps/extract-cacao.stamp:
+stamps/extract-cacao.stamp: stamps/download-cacao.stamp
if BUILD_CACAO
if !USE_SYSTEM_CACAO
if USE_ALT_CACAO_SRC_DIR
@@ -1124,7 +1155,7 @@
mkdir -p stamps
touch $@
-stamps/extract-jamvm.stamp:
+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
if BUILD_JAMVM
set -e ; \
if ! test -d jamvm ; \
@@ -1837,11 +1868,13 @@
stamps/add-archive.stamp: stamps/icedtea.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
+if !ZERO_BUILD
if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
fi
endif
endif
+endif
touch stamps/add-archive.stamp
clean-add-archive:
@@ -1851,11 +1884,13 @@
stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
+if !ZERO_BUILD
if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
fi
endif
endif
+endif
touch stamps/add-archive-debug.stamp
clean-add-archive-debug:
@@ -2032,11 +2067,13 @@
stamps/add-archive-ecj.stamp: stamps/icedtea-ecj.stamp
if !ENABLE_JAMVM
if !ENABLE_CACAO
+if !ZERO_BUILD
if [ -e $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
$(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
fi
endif
endif
+endif
touch stamps/add-archive-ecj.stamp
clean-add-archive-ecj:
@@ -2681,8 +2718,12 @@
extract: stamps/extract.stamp
+extract-cacao: stamps/extract-cacao.stamp
+
extract-ecj: stamps/extract-ecj.stamp
+extract-jamvm: stamps/extract-jamvm.stamp
+
hotspot-ports: stamps/ports.stamp
icedtea: stamps/icedtea.stamp
diff -r d8acef41b7b6 -r 55720644035f NEWS
--- a/NEWS Wed Jan 30 00:52:15 2013 +0000
+++ b/NEWS Wed Feb 13 23:54:10 2013 +0000
@@ -101,6 +101,7 @@
* SystemTap
- Addition of garbage collection probes
+
New in release 1.11.5 (2012-10-16):
* Security fixes
diff -r d8acef41b7b6 -r 55720644035f patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch
--- a/patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch Wed Jan 30 00:52:15 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,394 +0,0 @@
-# HG changeset patch
-# User andrew
-# Date 1301696137 25200
-# Node ID 37be97a5839376b2d2fa1d2ac1ab3a6cbe0653d0
-# Parent b025bffd6c2ca81c7c08f0dd2f4b2e0ba3223c05
-7010849: 5/5 Extraneous javac source/target options when building sa-jdi
-Summary: Make code changes necessary to get rid of the '-source 1.4 -target 1.4' options.
-Reviewed-by: dholmes, dcubed
-
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java b/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/HelloWorld.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2001, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 2011, 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
-@@ -55,7 +55,7 @@
- synchronized(lock) {
- if (useMethodInvoke) {
- try {
-- Method method = HelloWorld.class.getMethod("e", null);
-+ Method method = HelloWorld.class.getMethod("e");
- Integer result = (Integer) method.invoke(null, new Object[0]);
- return result.intValue();
- }
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ByteValueImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2011, 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
-@@ -52,12 +52,10 @@
- return intValue();
- }
-
-- public int compareTo(Object obj) {
-- byte other = ((ByteValue)obj).value();
-- return value() - other;
-+ public int compareTo(ByteValue byteVal) {
-+ return value() - byteVal.value();
- }
-
--
- public Type type() {
- return vm.theByteType();
- }
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/CharValueImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2011, 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
-@@ -52,9 +52,8 @@
- return intValue();
- }
-
-- public int compareTo(Object obj) {
-- char other = ((CharValue)obj).value();
-- return value() - other;
-+ public int compareTo(CharValue charVal) {
-+ return value() - charVal.value();
- }
-
- public Type type() {
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2011, 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
-@@ -186,7 +186,7 @@
- // assert isVMVersionMismatch(throwable), "not a VMVersionMismatch"
- Class expClass = throwable.getClass();
- Method targetVersionMethod = expClass.getMethod("getTargetVersion", new Class[0]);
-- return (String) targetVersionMethod.invoke(throwable, null);
-+ return (String) targetVersionMethod.invoke(throwable);
- }
-
- /** If the causal chain has a sun.jvm.hotspot.runtime.VMVersionMismatchException,
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/DoubleValueImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2011, 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,8 +45,8 @@
- }
- }
-
-- public int compareTo(Object obj) {
-- double other = ((DoubleValue)obj).value();
-+ public int compareTo(DoubleValue doubleVal) {
-+ double other = doubleVal.value();
- if (value() < other) {
- return -1;
- } else if (value() == other) {
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FieldImpl.java
-@@ -145,8 +145,7 @@
- }
-
- // From interface Comparable
-- public int compareTo(Object object) {
-- Field field = (Field)object;
-+ public int compareTo(Field field) {
- ReferenceTypeImpl declaringType = (ReferenceTypeImpl)declaringType();
- int rc = declaringType.compareTo(field.declaringType());
- if (rc == 0) {
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/FloatValueImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2011, 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
-@@ -52,8 +52,8 @@
- return intValue();
- }
-
-- public int compareTo(Object obj) {
-- float other = ((FloatValue)obj).value();
-+ public int compareTo(FloatValue floatVal) {
-+ float other = floatVal.value();
- if (value() < other) {
- return -1;
- } else if (value() == other) {
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/IntegerValueImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2011, 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
-@@ -52,9 +52,8 @@
- return intValue();
- }
-
-- public int compareTo(Object obj) {
-- int other = ((IntegerValue)obj).value();
-- return value() - other;
-+ public int compareTo(IntegerValue integerVal) {
-+ return value() - integerVal.value();
- }
-
- public Type type() {
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocalVariableImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2011, 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
-@@ -67,8 +67,8 @@
- return (int)method.hashCode() + slot();
- }
-
-- public int compareTo(Object object) {
-- LocalVariableImpl other = (LocalVariableImpl)object;
-+ public int compareTo(LocalVariable localVar) {
-+ LocalVariableImpl other = (LocalVariableImpl) localVar;
- int rc = method.compareTo(other.method);
- if (rc == 0) {
- rc = slot() - other.slot();
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LocationImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 2011, 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
-@@ -78,8 +78,7 @@
- return method().hashCode() + (int)codeIndex();
- }
-
-- public int compareTo(Object object) {
-- LocationImpl other = (LocationImpl)object;
-+ public int compareTo(Location other) {
- int rc = method().compareTo(other.method());
- if (rc == 0) {
More information about the distro-pkg-dev
mailing list