Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 1698674ee -> 24aa7e581
[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/a91e1fdc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a91e1fdc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a91e1fdc Branch: refs/heads/3.0.x-fixes Commit: a91e1fdc8bab5e4699cbf5e25e276b28be95813f Parents: 1698674 Author: Colm O hEigeartaigh <[email protected]> Authored: Fri Nov 21 17:37:57 2014 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Nov 24 10:56:55 2014 +0000 ---------------------------------------------------------------------- .../org/apache/cxf/ws/security/trust/AbstractSTSClient.java | 6 +++--- .../java/org/apache/cxf/ws/security/trust/TrustException.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a91e1fdc/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 013ff49..5e0ea25 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); } } } @@ -1436,7 +1436,7 @@ public abstract class AbstractSTSClient implements Configurable, InterceptorProv try { secret = psha1.createKey(requestorEntropy, serviceEntr, 0, length / 8); } catch (WSSecurityException e) { - throw new TrustException("DERIVED_KEY_ERROR", LOG, e); + throw new TrustException("DERIVED_KEY_ERROR", e, LOG); } } else { // Service entropy missing @@ -1487,7 +1487,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/a91e1fdc/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..e77f0d4 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,7 +61,7 @@ public class TrustException extends UncheckedException { public TrustException(String msg, Logger log) { super(new Message(msg, log)); } - public TrustException(String msg, Logger log, Throwable t) { + public TrustException(String msg, Throwable t, Logger log) { super(new Message(msg, log), t); }
