You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2015/01/29 09:25:12 UTC

[1/2] cxf git commit: [CXF-6227] Do not call connection.setFixedLengthStreamingMode(i) to prevent https://bugs.openjdk.java.net/browse/JDK-8044726

Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 93c7a9839 -> f5a7119bb


[CXF-6227] Do not call connection.setFixedLengthStreamingMode(i) to prevent https://bugs.openjdk.java.net/browse/JDK-8044726


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

Branch: refs/heads/3.0.x-fixes
Commit: 2e3c3400453fb3cc815c54a7c2e9c2bd192e1495
Parents: 93c7a98
Author: Alessio Soldano <as...@redhat.com>
Authored: Wed Jan 28 23:18:39 2015 +0100
Committer: Alessio Soldano <as...@redhat.com>
Committed: Thu Jan 29 09:21:00 2015 +0100

----------------------------------------------------------------------
 .../apache/cxf/transport/http/URLConnectionHTTPConduit.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/2e3c3400/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
index b8fc075..9f44f35 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/URLConnectionHTTPConduit.java
@@ -275,7 +275,13 @@ public class URLConnectionHTTPConduit extends HTTPConduit {
             return connection.usingProxy();
         }
         protected void setFixedLengthStreamingMode(int i) {
-            connection.setFixedLengthStreamingMode(i);
+            // [CXF-6227] do not call connection.setFixedLengthStreamingMode(i)
+            // to prevent https://bugs.openjdk.java.net/browse/JDK-8044726
+        }
+        protected void handleNoOutput() throws IOException {
+            if ("POST".equals(getMethod())) {
+                connection.getOutputStream().close();
+            }
         }
         protected void setupNewConnection(String newURL) throws IOException {
             HTTPClientPolicy cp = getClient(outMessage);


[2/2] cxf git commit: Recording .gitmergeinfo Changes

Posted by as...@apache.org.
Recording .gitmergeinfo Changes


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

Branch: refs/heads/3.0.x-fixes
Commit: f5a7119bb69f8d77138647625fca480120e3de9f
Parents: 2e3c340
Author: Alessio Soldano <as...@redhat.com>
Authored: Thu Jan 29 09:23:12 2015 +0100
Committer: Alessio Soldano <as...@redhat.com>
Committed: Thu Jan 29 09:23:12 2015 +0100

----------------------------------------------------------------------
 .gitmergeinfo | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f5a7119b/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 193a185..33b9f28 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -213,6 +213,7 @@ M e2ad037fbc74f42655ac968415fcb4bded87bb38
 M e47e394114d6a3bf06401960618e6bd556a904d7
 M e5a805853864e291626bdb913448fc4e2409cca0
 M e80d3da7612db41f7efe9c5d3128965ec7d2809b
+M ea4a8deb4f5cc994ab3896bd134c57783f2f8c51
 M eb3dd938052b3e853b0cf85dacf31ef7f802af38
 M efaf05170b4f76ad61ff423e30ece58bdd226ae5
 M f02b02934bf78504ffc462c364dc43e386e727b2