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 2015/02/09 21:05:59 UTC
[1/2] cxf git commit: Fix build problem
Repository: cxf
Updated Branches:
refs/heads/master d621b327d -> 428f2ef31
Fix build problem
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5cbae240
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5cbae240
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5cbae240
Branch: refs/heads/master
Commit: 5cbae240c83b9851e8c0331ee042b7c8a89f15d1
Parents: d621b32
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 9 15:04:53 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 15:05:14 2015 -0500
----------------------------------------------------------------------
.../cxf/jaxws/interceptors/WrapperClassOutInterceptor.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5cbae240/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
index 7a06181..0afd9a1 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/WrapperClassOutInterceptor.java
@@ -86,9 +86,8 @@ public class WrapperClassOutInterceptor extends AbstractPhaseInterceptor<Message
try {
MessageContentsList newObjs = new MessageContentsList();
if (ServiceUtils.isSchemaValidationEnabled(SchemaValidationType.OUT, message)
- && helper instanceof AbstractWrapperHelper) { {
- ((AbstractWrapperHelper)helper).setValidate(true);
- }
+ && helper instanceof AbstractWrapperHelper) {
+ ((AbstractWrapperHelper)helper).setValidate(true);
}
Object o2 = helper.createWrapperObject(objs);
newObjs.put(firstMessagePart, o2);
[2/2] cxf git commit: [CXF-6236] Use the appropriate auth supplier
Posted by dk...@apache.org.
[CXF-6236] Use the appropriate auth supplier
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/428f2ef3
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/428f2ef3
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/428f2ef3
Branch: refs/heads/master
Commit: 428f2ef31d816b80644f4c99c09d0952e4b15ab2
Parents: 5cbae24
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Feb 9 15:05:24 2015 -0500
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Feb 9 15:05:24 2015 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/transport/http/HTTPConduit.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/428f2ef3/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
index 050c609..4b9adc1 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
@@ -779,7 +779,7 @@ public abstract class HTTPConduit
headers.setAuthorization(authString);
}
- String proxyAuthString = authSupplier.getAuthorization(proxyAuthorizationPolicy,
+ String proxyAuthString = proxyAuthSupplier.getAuthorization(proxyAuthorizationPolicy,
currentURI, message, null);
if (proxyAuthString != null) {
headers.setProxyAuthorization(proxyAuthString);