fix request body

unimined · Sep 23, 2024 · 7aad379 · 7aad379
1 parent 7d4f4ca
commit 7aad379
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/impl/http/HttpClientImpl.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/impl/http/HttpClientImpl.java
@@ -154,7 +154,7 @@ public void onSubscribe(Flow.Subscription subscription) {
                 @Override
                 public void onNext(ByteBuffer item) {
                     try {
-                        out.write(item.array());
+                        out.write(item.array(), item.arrayOffset() + item.position(), item.remaining());
                     } catch (IOException e) {
                         Utils.sneakyThrow(e);
                     }
@@ -190,7 +190,9 @@ public void onComplete() {
         HttpResponseInfo info = new HttpResponseInfo(responseCode, new J_N_H_HttpHeaders(headers), version);
         J_N_H_HttpResponse.BodySubscriber<T> subscriber = handler.apply(info);
         try (InputStream is = responseCode >= 400 ? connection.getErrorStream() : connection.getInputStream()) {
-            subscriber.onNext(List.of(ByteBuffer.wrap(is.readAllBytes())));
+            if (is != null) {
+                subscriber.onNext(List.of(ByteBuffer.wrap(is.readAllBytes())));
+            }
             subscriber.onComplete();
             T body = subscriber.getBody().toCompletableFuture().join();
 

diff --git a/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_net_http/J_N_H_HttpRequest.java b/java-api/src/java11/java/xyz/wagyourtail/jvmdg/j11/stub/java_net_http/J_N_H_HttpRequest.java
@@ -178,9 +178,7 @@ public void request(long n) {
                                 return;
                             }
                             completed = true;
-                            ByteBuffer buffer = ByteBuffer.wrap(bytes, offset, length);
-                            buffer.flip();
-                            subscriber.onNext(buffer);
+                            subscriber.onNext(ByteBuffer.wrap(bytes, offset, length));
                             subscriber.onComplete();
                         }
 
@@ -220,9 +218,7 @@ public void request(long n) {
                             }
                             completed = true;
                             try (InputStream is = Files.newInputStream(file)) {
-                                ByteBuffer buffer = ByteBuffer.wrap(is.readAllBytes());
-                                buffer.flip();
-                                subscriber.onNext(buffer);
+                                subscriber.onNext(ByteBuffer.wrap(is.readAllBytes()));
                                 subscriber.onComplete();
                             } catch (Exception e) {
                                 subscriber.onError(e);