| commit | 548435b82a22f844db958d9efc8fc1eef336f8a6 | [log] [tgz] |
|---|---|---|
| author | Vamsavardhana Chillakuru <vamsic007@apache.org> | Tue Dec 05 17:10:35 2006 +0000 |
| committer | Vamsavardhana Chillakuru <vamsic007@apache.org> | Tue Dec 05 17:10:35 2006 +0000 |
| tree | b12b3f167dda0cc03a058c4f8063ea3f1365d301 | |
| parent | 811f61a67bb9bd4997425f805a4f9d4e70e83e53 [diff] |
GERONIMO-1519 ResourceException.toString() can return null o Fixes toString() to return non-null string git-svn-id: https://svn.apache.org/repos/asf/geronimo/specs/branches/1_1@482713 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-spec-j2ee-connector/src/main/java/javax/resource/ResourceException.java b/geronimo-spec-j2ee-connector/src/main/java/javax/resource/ResourceException.java index 8ad6fc9..de1137b 100644 --- a/geronimo-spec-j2ee-connector/src/main/java/javax/resource/ResourceException.java +++ b/geronimo-spec-j2ee-connector/src/main/java/javax/resource/ResourceException.java
@@ -79,6 +79,8 @@ public String toString() { // unit tests revealed that the errorCode is not included - return getMessage(); + String className = getClass().getName(); + String msg = getMessage(); + return msg != null ? className + ": "+msg : className; } }
diff --git a/geronimo-spec-j2ee-connector/src/test/java/javax/resource/ResourceExceptionTest.java b/geronimo-spec-j2ee-connector/src/test/java/javax/resource/ResourceExceptionTest.java index 7861caf..aad7007 100644 --- a/geronimo-spec-j2ee-connector/src/test/java/javax/resource/ResourceExceptionTest.java +++ b/geronimo-spec-j2ee-connector/src/test/java/javax/resource/ResourceExceptionTest.java
@@ -54,9 +54,9 @@ public void testToString() { ResourceException exception = new ResourceException("problem"); - assertEquals("problem", exception.toString()); + assertEquals(ResourceException.class.getName()+": "+"problem", exception.toString()); ResourceException other = new ResourceException("other problem", "123"); - assertEquals("other problem", other.toString()); + assertEquals(ResourceException.class.getName()+": "+"other problem", other.toString()); } }