You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/09 18:41:26 UTC
svn commit: r1501372 - in /cxf/trunk/api/src/main/java/org/apache/cxf:
common/i18n/UncheckedException.java interceptor/Fault.java
Author: dkulp
Date: Tue Jul 9 16:41:25 2013
New Revision: 1501372
URL: http://svn.apache.org/r1501372
Log:
Fix some problems that PMD 5.0.4 will flag
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java
cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java?rev=1501372&r1=1501371&r2=1501372&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java Tue Jul 9 16:41:25 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;
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java?rev=1501372&r1=1501371&r2=1501372&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/interceptor/Fault.java Tue Jul 9 16:41:25 2013
@@ -42,7 +42,7 @@ public class Fault extends UncheckedExce
private static final long serialVersionUID = -1583932965031558864L;
private Element detail;
- private String message;
+ private String messageString;
private QName code;
private String lang;
/**
@@ -52,13 +52,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;
}
@@ -83,42 +83,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() {