/hg/release/icedtea6-1.12: 5 new changesets
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Mon Feb 4 16:17:51 PST 2013
changeset 62dd6aa7c604 in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=62dd6aa7c604
author: Omair Majid <omajid at redhat.com>
date: Mon Feb 04 00:51:04 2013 -0500
Add the 2013-02-01 Security Fixes
2013-02-04 Andrew John Hughes <gnu.andrew at redhat.com>
Omair Majid <omajid at redhat.com>
* Makefile.am:
(SECURITY_PATCHES): Add latest batch.
* patches/openjdk/7162902-corba_fixes.patch,
* 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.
changeset 1ca45d31afce in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=1ca45d31afce
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 76bd26205c60 in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=76bd26205c60
author: Omair Majid <omajid at redhat.com>
date: Mon Feb 04 01:03:56 2013 -0500
Add security fixes to NEWS.
2013-02-04 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Add security fixes.
changeset 63fea6a4bee0 in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=63fea6a4bee0
author: Omair Majid <omajid at redhat.com>
date: Mon Feb 04 01:07:39 2013 -0500
Bump to 1.12.1 and set release date
2013-02-04 Andrew John Hughes <gnu.andrew at redhat.com>
Omair Majid <omajid at redhat.com>
* NEWS: Add release date.
* configure.ac: Bump to 1.12.1.
changeset 1d484ae64eb7 in /hg/release/icedtea6-1.12
details: http://icedtea.classpath.org/hg/release/icedtea6-1.12?cmd=changeset;node=1d484ae64eb7
author: Omair Majid <omajid at redhat.com>
date: Mon Feb 04 17:59:40 2013 -0500
Added tag icedtea6-1.12.1 for changeset 63fea6a4bee0
diffstat:
.hgtags | 1 +
ChangeLog | 59 +
Makefile.am | 35 +-
NEWS | 37 +-
configure.ac | 2 +-
patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch | 394 -
patches/openjdk/6633275-shaped_translucent_windows.patch | 28 +-
patches/openjdk/7010849-modernise_sa.patch | 394 +
patches/openjdk/7162902-corba_fixes.patch | 19 +-
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 | 436 +
patches/security/20130201/7197546.patch | 479 +
patches/security/20130201/7200491.patch | 49 +
patches/security/20130201/7200500.patch | 60 +
patches/security/20130201/7201064.patch | 117 +
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, 21164 insertions(+), 430 deletions(-)
diffs (truncated from 21840 to 500 lines):
diff -r c3d7a7f46fcb -r 1d484ae64eb7 .hgtags
--- a/.hgtags Tue Jan 29 20:53:39 2013 +0000
+++ b/.hgtags Mon Feb 04 17:59:40 2013 -0500
@@ -23,3 +23,4 @@
24c5bd2e7d574441813bfb8f9e4636e50c5d7c28 icedtea6-1.11-branchpoint
5a1e1b39664409e9a0945ba49b558f25ef976c58 icedtea6-1.12-branchpoint
69b6ee29712304225f57535e507e6745e478ae9e icedtea6-1.12
+63fea6a4bee0e2e8ecb9f2061dba92be4924ddb4 icedtea6-1.12.1
diff -r c3d7a7f46fcb -r 1d484ae64eb7 ChangeLog
--- a/ChangeLog Tue Jan 29 20:53:39 2013 +0000
+++ b/ChangeLog Mon Feb 04 17:59:40 2013 -0500
@@ -1,3 +1,62 @@
+2013-02-04 Andrew John Hughes <gnu.andrew at redhat.com>
+ Omair Majid <omajid at redhat.com>
+
+ * NEWS: Add release date.
+ * configure.ac: Bump to 1.12.1.
+
+2013-02-04 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Add security fixes.
+
+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-04 Andrew John Hughes <gnu.andrew at redhat.com>
+ Omair Majid <omajid at redhat.com>
+
+ * Makefile.am:
+ (SECURITY_PATCHES): Add latest batch.
+ * patches/openjdk/7162902-corba_fixes.patch,
+ * 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: Use the correct year; it is
diff -r c3d7a7f46fcb -r 1d484ae64eb7 Makefile.am
--- a/Makefile.am Tue Jan 29 20:53:39 2013 +0000
+++ b/Makefile.am Mon Feb 04 17:59:40 2013 -0500
@@ -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,8 @@
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
if WITH_RHINO
ICEDTEA_PATCHES += \
@@ -527,7 +557,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 \
diff -r c3d7a7f46fcb -r 1d484ae64eb7 NEWS
--- a/NEWS Tue Jan 29 20:53:39 2013 +0000
+++ b/NEWS Mon Feb 04 17:59:40 2013 -0500
@@ -10,7 +10,41 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.12.1 (2012-02-XX):
+New in release 1.12.1 (2012-02-04):
+
+* Security fixes
+ - S6563318, CVE-2013-0424: RMI data sanitization
+ - S6664509, CVE-2013-0425: Add logging context
+ - S6664528, CVE-2013-0426: Find log level matching its name or value given at construction time
+ - S6776941: CVE-2013-0427: Improve thread pool shutdown
+ - S7141694, CVE-2013-0429: Improving CORBA internals
+ - S7173145: Improve in-memory representation of splashscreens
+ - S7186945: Unpack200 improvement
+ - S7186946: Refine unpacker resource usage
+ - S7186948: Improve Swing data validation
+ - S7186952, CVE-2013-0432: Improve clipboard access
+ - S7186954: Improve connection performance
+ - S7186957: Improve Pack200 data validation
+ - S7192392, CVE-2013-0443: Better validation of client keys
+ - S7192393, CVE-2013-0440: Better Checking of order of TLS Messages
+ - S7192977, CVE-2013-0442: Issue in toolkit thread
+ - S7197546, CVE-2013-0428: (proxy) Reflect about creating reflective proxies
+ - S7200491: Tighten up JTable layout code
+ - S7200500: Launcher better input validation
+ - S7201064: Better dialogue checking
+ - S7201066, CVE-2013-0441: Change modifiers on unused fields
+ - S7201068, CVE-2013-0435: Better handling of UI elements
+ - S7201070: Serialization to conform to protocol
+ - S7201071, CVE-2013-0433: InetSocketAddress serialization issue
+ - S8000210: Improve JarFile code quality
+ - S8000537, CVE-2013-0450: Contextualize RequiredModelMBean class
+ - S8000540, CVE-2013-1475: Improve IIOP type reuse management
+ - S8000631, CVE-2013-1476: Restrict access to class constructor
+ - S8001235, CVE-2013-0434: Improve JAXP HTTP handling
+ - S8001242: Improve RMI HTTP conformance
+ - S8001307: Modify ACC_SUPER behavior
+ - S8001972, CVE-2013-1478: Improve image processing
+ - S8002325, CVE-2013-1480: Improve management of images
New in release 1.12.0 (2013-01-29):
@@ -101,6 +135,7 @@
* SystemTap
- Addition of garbage collection probes
+
New in release 1.11.5 (2012-10-16):
* Security fixes
diff -r c3d7a7f46fcb -r 1d484ae64eb7 configure.ac
--- a/configure.ac Tue Jan 29 20:53:39 2013 +0000
+++ b/configure.ac Mon Feb 04 17:59:40 2013 -0500
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.12.1pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.12.1],[distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AC_CONFIG_FILES([Makefile])
diff -r c3d7a7f46fcb -r 1d484ae64eb7 patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch
--- a/patches/ecj/7010849-make_sa-jdi_build_with_1.5.patch Tue Jan 29 20:53:39 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) {
- long diff = codeIndex() - other.codeIndex();
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/LongValueImpl.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) {
-- long other = ((LongValue)obj).value();
-+ public int compareTo(LongValue longVal) {
-+ long other = longVal.value();
- if (value() < other) {
- return -1;
- } else if (value() == other) {
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/MethodImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2005, 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
-@@ -200,8 +200,7 @@
- }
-
- // From interface Comparable
-- public int compareTo(Object object) {
-- Method method = (Method)object;
-+ public int compareTo(Method method) {
- ReferenceTypeImpl declaringType = (ReferenceTypeImpl)declaringType();
- int rc = declaringType.compareTo(method.declaringType());
- if (rc == 0) {
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ReferenceTypeImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2005, 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
-@@ -99,7 +99,7 @@
- return saKlass.hashCode();
- }
-
-- public int compareTo(Object object) {
-+ public int compareTo(ReferenceType refType) {
- /*
- * Note that it is critical that compareTo() == 0
- * implies that equals() == true. Otherwise, TreeSet
-@@ -108,7 +108,7 @@
- * (Classes of the same name loaded by different class loaders
- * or in different VMs must not return 0).
- */
-- ReferenceTypeImpl other = (ReferenceTypeImpl)object;
-+ ReferenceTypeImpl other = (ReferenceTypeImpl)refType;
- int comp = name().compareTo(other.name());
- if (comp == 0) {
- Oop rf1 = ref();
-diff --git a/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java b/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java
---- openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.java
-+++ openjdk-ecj/hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ShortValueImpl.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) {
-- short other = ((ShortValue)obj).value();
-- return value() - other;
-+ public int compareTo(ShortValue shortVal) {
-+ return value() - shortVal.value();
More information about the distro-pkg-dev
mailing list