commit 1c3b8d5e031814da04c5a0050ca1e6a1c0faf52c
author Maxim Nesen <maxim.nesen@oracle.com> Tue Oct 01 19:57:55 2019 +0200
committer jansupol <15908245+jansupol@users.noreply.github.com> Wed Oct 02 14:57:45 2019 +0200
tree 95313db86c71f4f87852d5fa08b60531990553d8
parent b17b3ea4f8c87c6d36d430f807715d495c6873ea

use EntityInputStream to check if stream is empty

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>

media/json-binding/src/main/java/org/glassfish/jersey/jsonb/internal/JsonBindingProvider.java

diff --git a/media/json-binding/src/main/java/org/glassfish/jersey/jsonb/internal/JsonBindingProvider.java b/media/json-binding/src/main/java/org/glassfish/jersey/jsonb/internal/JsonBindingProvider.java
index c8a1c7e..3ac8031 100644
--- a/media/json-binding/src/main/java/org/glassfish/jersey/jsonb/internal/JsonBindingProvider.java
+++ b/media/json-binding/src/main/java/org/glassfish/jersey/jsonb/internal/JsonBindingProvider.java
@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.PushbackInputStream;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 
@@ -41,6 +40,7 @@
 
 import org.glassfish.jersey.jsonb.LocalizationMessages;
 import org.glassfish.jersey.message.internal.AbstractMessageReaderWriterProvider;
+import org.glassfish.jersey.message.internal.EntityInputStream;
 
 /**
  * Entity provider (reader and writer) for JSONB.
@@ -72,20 +72,10 @@
                            MediaType mediaType,
                            MultivaluedMap<String, String> httpHeaders,
                            InputStream entityStream) throws IOException, WebApplicationException {
-        if (entityStream.markSupported()) {
-            entityStream.mark(1);
-            if (entityStream.read() == -1) {
-                throw new NoContentException(LocalizationMessages.ERROR_JSONB_EMPTYSTREAM());
-            }
-            entityStream.reset();
-        } else {
-            final PushbackInputStream buffer = new PushbackInputStream(entityStream);
-            final int firstByte = buffer.read();
-            if (firstByte == -1) {
-                throw new NoContentException(LocalizationMessages.ERROR_JSONB_EMPTYSTREAM());
-            }
-            buffer.unread(firstByte);
-            entityStream = buffer;
+        final EntityInputStream entityInputStream =  new EntityInputStream(entityStream);
+        entityStream = entityInputStream;
+        if (entityInputStream.isEmpty()) {
+            throw new NoContentException(LocalizationMessages.ERROR_JSONB_EMPTYSTREAM());
         }
 
         Jsonb jsonb = getJsonb(type);