cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject cxf git commit: [CXF-6109] - Incorrect TrustException constructor in AbstractSTSClient
Date Mon, 24 Nov 2014 11:27:35 GMT
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes b831ff87e -> a5a06007b


[CXF-6109] - Incorrect TrustException constructor in AbstractSTSClient


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a5a06007
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a5a06007
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a5a06007

Branch: refs/heads/2.7.x-fixes
Commit: a5a06007b0bd19a903172ce2b1d8c3e19ab5d698
Parents: b831ff8
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Nov 24 11:27:16 2014 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Nov 24 11:27:16 2014 +0000

----------------------------------------------------------------------
 .../org/apache/cxf/ws/security/trust/AbstractSTSClient.java    | 6 +++---
 .../java/org/apache/cxf/ws/security/trust/TrustException.java  | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/a5a06007/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index 4ac8c0c..50f628a 100755
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -586,7 +586,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
                     client = new ClientImpl(bus, endpoint);
                 }
             } catch (Exception ex) {
-                throw new TrustException(LOG, "WS_MEX_ERROR", ex);
+                throw new TrustException("WS_MEX_ERROR", ex, LOG);
             }
         }
     }
@@ -1414,7 +1414,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
                     try {
                         secret = psha1.createKey(requestorEntropy, serviceEntr, 0, length
/ 8);
                     } catch (ConversationException e) {
-                        throw new TrustException("DERIVED_KEY_ERROR", LOG, e);
+                        throw new TrustException("DERIVED_KEY_ERROR", e, LOG);
                     }
                 } else {
                     // Service entropy missing
@@ -1465,7 +1465,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv
                         WSSecurityEngineResult.TAG_SECRET
                     );
             } catch (IOException e) {
-                throw new TrustException("ENCRYPTED_KEY_ERROR", LOG, e);
+                throw new TrustException("ENCRYPTED_KEY_ERROR", e, LOG);
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/cxf/blob/a5a06007/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/TrustException.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/TrustException.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/TrustException.java
index 72c9748..6ea7eee 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/TrustException.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/TrustException.java
@@ -61,6 +61,12 @@ public class TrustException extends UncheckedException {
     public TrustException(String msg, Logger log) {
         super(new Message(msg, log));
     }
+    
+    public TrustException(String msg, Throwable t, Logger log) {
+        super(new Message(msg, log), t);
+    }
+    
+    @Deprecated
     public TrustException(String msg, Logger log, Throwable t) {
         super(new Message(msg, log), t);
     }


Mime
View raw message