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 2014/06/16 20:37:37 UTC
[1/2] git commit: [CXF-5763] Make sure the stream is only closed once
Repository: cxf
Updated Branches:
refs/heads/master da25b2af7 -> 99295330d
[CXF-5763] Make sure the stream is only closed once
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d3d7a359
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d3d7a359
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d3d7a359
Branch: refs/heads/master
Commit: d3d7a35954d01b42fbe5bc54a3fac09c8aef43b0
Parents: da25b2a
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jun 16 14:16:26 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jun 16 14:16:26 2014 -0400
----------------------------------------------------------------------
.../cxf/transport/http/asyncclient/AsyncHTTPConduit.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/d3d7a359/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index 96c5396..e09cb14 100644
--- a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++ b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -263,6 +263,7 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
private Future<Boolean> connectionFuture;
private Object sessionLock = new Object();
+ private boolean closed;
public AsyncWrappedOutputStream(Message message,
boolean needToCacheRequest,
@@ -393,7 +394,11 @@ public class AsyncHTTPConduit extends URLConnectionHTTPConduit {
@Override
public void close() throws IOException {
- if (!chunking && wrappedStream != null) {
+ if (closed) {
+ return;
+ }
+ closed = true;
+ if (!chunking && wrappedStream instanceof CachedOutputStream) {
CachedOutputStream out = (CachedOutputStream)wrappedStream;
this.basicEntity.setContentLength(out.size());
wrappedStream = null;
[2/2] git commit: [CXF-5753] Update to use the addChildElement calls
that use qnames that don't "inherit" default namespaces and such.
Posted by dk...@apache.org.
[CXF-5753] Update to use the addChildElement calls that use qnames that don't "inherit" default namespaces and such.
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/99295330
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/99295330
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/99295330
Branch: refs/heads/master
Commit: 99295330d81e603525c4d110f18ac218a1000c03
Parents: d3d7a35
Author: Daniel Kulp <dk...@apache.org>
Authored: Mon Jun 16 14:36:25 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Mon Jun 16 14:36:25 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/99295330/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
----------------------------------------------------------------------
diff --git a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
index d4d6ef9..4a30ed3 100644
--- a/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
+++ b/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/saaj/SAAJStreamWriter.java
@@ -156,9 +156,9 @@ public final class SAAJStreamWriter extends OverlayW3CDOMStreamWriter {
try {
Element el = null;
if (StringUtils.isEmpty(pfx) && StringUtils.isEmpty(ns)) {
- el = ((SOAPElement)cur).addChildElement(local);
+ el = ((SOAPElement)cur).addChildElement(new QName(local));
} else {
- el = ((SOAPElement)cur).addChildElement(local, pfx, ns);
+ el = ((SOAPElement)cur).addChildElement(new QName(ns, local, pfx == null ? "" : pfx));
}
cur.removeChild(el);
return el;