cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1502598 - in /cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf: common/i18n/UncheckedException.java interceptor/Fault.java
Date Fri, 12 Jul 2013 16:21:02 GMT
Author: dkulp
Date: Fri Jul 12 16:21:02 2013
New Revision: 1502598

URL: http://svn.apache.org/r1502598
Log:
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.7.x-fixes/api/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java
    cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java

Modified: cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java?rev=1502598&r1=1502597&r2=1502598&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java
(original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/common/i18n/UncheckedException.java
Fri Jul 12 16:21:02 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/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java?rev=1502598&r1=1502597&r2=1502598&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java (original)
+++ cxf/branches/2.7.x-fixes/api/src/main/java/org/apache/cxf/interceptor/Fault.java Fri Jul
12 16:21:02 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() {



Mime
View raw message