Author: dkulp Date: Mon Jul 15 18:50:13 2013 New Revision: 1503413 URL: http://svn.apache.org/r1503413 Log: Merged revisions 1503372 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........ r1503372 | dkulp | 2013-07-15 14:03:42 -0400 (Mon, 15 Jul 2013) | 18 lines Merged revisions 1502598 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1502598 | dkulp | 2013-07-12 12:21:02 -0400 (Fri, 12 Jul 2013) | 10 lines Merged revisions 1501372 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1501372 | dkulp | 2013-07-09 12:41:25 -0400 (Tue, 09 Jul 2013) | 2 lines Fix some problems that PMD 5.0.4 will flag ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java Modified: cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java?rev=1503413&r1=1503412&r2=1503413&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java (original) +++ cxf/branches/2.5.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java Mon Jul 15 18:50:13 2013 @@ -41,7 +41,7 @@ public class Fault extends UncheckedExce private static final int DEFAULT_HTTP_RESPONSE_CODE = 500; private Element detail; - private String message; + private String messageString; private QName code; private String lang; /** @@ -51,13 +51,13 @@ public class Fault extends UncheckedExce public Fault(Message message, Throwable throwable) { super(message, throwable); - this.message = message.toString(); + this.messageString = message.toString(); code = FAULT_CODE_SERVER; } public Fault(Message message) { super(message); - this.message = message.toString(); + this.messageString = message.toString(); code = FAULT_CODE_SERVER; } @@ -82,42 +82,42 @@ public class Fault extends UncheckedExce public Fault(Throwable t) { super(t); - if (super.getMessage() != null) { - message = super.getMessage(); + if (message != null) { + messageString = message.toString(); } else { - message = t == null ? null : t.getMessage(); + messageString = t == null ? null : t.getMessage(); } code = FAULT_CODE_SERVER; } public Fault(Message message, Throwable throwable, QName fc) { super(message, throwable); - this.message = message.toString(); + this.messageString = message.toString(); code = fc; } public Fault(Message message, QName fc) { super(message); - this.message = message.toString(); + this.messageString = message.toString(); code = fc; } public Fault(Throwable t, QName fc) { super(t); - if (super.getMessage() != null) { - message = super.getMessage(); + if (message != null) { + messageString = message.toString(); } else { - message = t == null ? null : t.getMessage(); + messageString = t == null ? null : t.getMessage(); } code = fc; } public String getMessage() { - return message; + return messageString; } public void setMessage(String message) { - this.message = message; + this.messageString = message; } public QName getFaultCode() { Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java?rev=1503413&r1=1503412&r2=1503413&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java (original) +++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java Mon Jul 15 18:50:13 2013 @@ -28,7 +28,7 @@ public class UncheckedException extends private static final long serialVersionUID = 1L; - private final Message message; + protected final Message message; public UncheckedException(Message msg) { message = msg;
