diff options
| author | Gary Benson <gbenson@redhat.com> | 2007-02-15 09:02:38 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2007-02-15 09:02:38 +0000 |
| commit | c8a90e81637883d0ca883b094962ef8a738e4220 (patch) | |
| tree | 36db14a8652a87213605e219b163f3fc6d33729b /libjava | |
| parent | 760eb3eabc76ac60b1f2761cf74d666663f289a0 (diff) | |
| download | gcc-c8a90e81637883d0ca883b094962ef8a738e4220.zip gcc-c8a90e81637883d0ca883b094962ef8a738e4220.tar.gz gcc-c8a90e81637883d0ca883b094962ef8a738e4220.tar.bz2 | |
2007-02-14 Gary Benson <gbenson@redhat.com>
* javax/management/ObjectName.java
(toString): Return this item's canonical name.
From-SVN: r121989
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 5 | ||||
| -rw-r--r-- | libjava/classpath/javax/management/ObjectName.java | 17 | ||||
| -rw-r--r-- | libjava/classpath/lib/javax/management/ObjectName.class | bin | 8752 -> 8493 bytes |
3 files changed, 13 insertions, 9 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index e50d8f7..75c1c25 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,8 @@ +2007-02-14 Gary Benson <gbenson@redhat.com> + + * javax/management/ObjectName.java + (toString): Return this item's canonical name. + 2007-02-12 Tom Tromey <tromey@redhat.com> * java/util/Collections.java (UnmodifiableMap.toArray): Imported diff --git a/libjava/classpath/javax/management/ObjectName.java b/libjava/classpath/javax/management/ObjectName.java index 573b984..0b18c01 100644 --- a/libjava/classpath/javax/management/ObjectName.java +++ b/libjava/classpath/javax/management/ObjectName.java @@ -1,5 +1,5 @@ /* ObjectName.java -- Represent the name of a bean, or a pattern for a name. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2007 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -716,19 +716,18 @@ public class ObjectName /** * Returns a textual representation of the object name. - * The format is unspecified, but it should be expected that - * two equivalent object names will return the same string - * from this method. + * + * <p>The format is unspecified beyond that equivalent object + * names will return the same string from this method, but note + * that Tomcat depends on the string returned by this method + * being a valid textual representation of the object name and + * will fail to start if it is not. * * @return a textual representation of the object name. */ public String toString() { - return getClass().toString() + - "[domain = " + domain + - ",properties = " + properties + - ",propertyPattern = " + propertyPattern + - "]"; + return getCanonicalName(); } /** diff --git a/libjava/classpath/lib/javax/management/ObjectName.class b/libjava/classpath/lib/javax/management/ObjectName.class Binary files differindex 63b44d4..9895cbf 100644 --- a/libjava/classpath/lib/javax/management/ObjectName.class +++ b/libjava/classpath/lib/javax/management/ObjectName.class |