Merge pull request #818 from tazmaniax/lighthouse-1889-patch

[#1889] WS call does not work in play-1.3.0RC2-12-g87e2d3c
playframework · Nov 19, 2014 · af47b60 · af47b60
2 parents 7fc2fd7 + 844cfed
commit af47b60
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/framework/dependencies.yml b/framework/dependencies.yml
@@ -12,7 +12,7 @@ require:    &allDependencies
     - cglib -> cglib-nodep 3.1
     - com.google.code.gson -> gson 2.2.4 
     - com.jamonapi -> jamon 2.75
-    - com.ning -> async-http-client 1.8.13
+    - com.ning -> async-http-client 1.8.14
     - commons-beanutils 1.8.3  
     - commons-codec 1.8
     - commons-collections 3.2.1

diff --git a/framework/lib/async-http-client-1.8.13.jar b/framework/lib/async-http-client-1.8.13.jar
diff --git a/framework/lib/async-http-client-1.8.14.jar b/framework/lib/async-http-client-1.8.14.jar
diff --git a/framework/src/play/libs/ws/WSAsync.java b/framework/src/play/libs/ws/WSAsync.java
@@ -494,10 +494,9 @@ private void checkFileBody(BoundRequestBuilder builder) {
                         }
                     }
                     try {
-                        byte[] bodyBytes = sb.toString().getBytes( this.encoding );
-                        InputStream bodyInStream = new ByteArrayInputStream( bodyBytes );
-                        builder.setBody( bodyInStream );
-                    } catch ( UnsupportedEncodingException e) {
+                        byte[] bodyBytes = sb.toString().getBytes(this.encoding);
+                        builder.setBody(bodyBytes);
+                    } catch (UnsupportedEncodingException e) {
                         throw new RuntimeException(e);
                     }
 
@@ -525,14 +524,13 @@ private void checkFileBody(BoundRequestBuilder builder) {
                 if (this.parameters != null && !this.parameters.isEmpty()) {
                     throw new RuntimeException("POST or PUT method with parameters AND body are not supported.");
                 }
-                if(this.body instanceof InputStream) {
+                if (this.body instanceof InputStream) {
                     builder.setBody((InputStream)this.body);
                 } else {
                     try {
-                        byte[] bodyBytes = this.body.toString().getBytes( this.encoding );
-                        InputStream bodyInStream = new ByteArrayInputStream( bodyBytes );
-                        builder.setBody( bodyInStream );
-                    } catch ( UnsupportedEncodingException e) {
+                        byte[] bodyBytes = this.body.toString().getBytes(this.encoding);
+                        builder.setBody(bodyBytes);
+                    } catch (UnsupportedEncodingException e) {
                         throw new RuntimeException(e);
                     }
                 }