From 49ee23c4c0e3c7d073390fba34a28b88847f4219 Mon Sep 17 00:00:00 2001 From: aph Date: Fri, 30 Jul 2010 10:49:36 +0000 Subject: 2010-07-30 Andrew Haley * javax/print/attribute/standard/JobStateReasons.java (add): Fix infinite recursion with call to super. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@162708 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/classpath/ChangeLog | 5 +++++ .../print/attribute/standard/JobStateReasons.java | 2 +- .../print/attribute/standard/JobStateReasons.class | Bin 2137 -> 2147 bytes 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'libjava/classpath') diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index b7a9a4c92cd..a7ee39fdc79 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,8 @@ +2010-07-30 Andrew Haley + + * javax/print/attribute/standard/JobStateReasons.java (add): Fix + infinite recursion with call to super. + 2010-06-04 Rainer Orth * scripts/check_jni_methods.sh.in: Don't use diff -U. diff --git a/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java b/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java index 503c06c0290..6c7a9f4aad4 100644 --- a/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java +++ b/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java @@ -129,7 +129,7 @@ public final class JobStateReasons extends HashSet if (o == null) throw new NullPointerException("reason is null"); - return add(o); + return super.add(o); } /** diff --git a/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class b/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class index f9cc7b3e866..5668b666461 100644 Binary files a/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class and b/libjava/classpath/lib/javax/print/attribute/standard/JobStateReasons.class differ -- cgit v1.2.1