[RESTEASY-2620]:Doesn't close stream for Publisher return

resteasy · Oct 27, 2020 · a05aebb · a05aebb
1 parent eea6c41
commit a05aebb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientInvocation.java b/resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/internal/ClientInvocation.java
@@ -57,6 +57,7 @@
 import org.jboss.resteasy.spi.util.Types;
 import org.jboss.resteasy.tracing.RESTEasyTracingLogger;
 import org.jboss.resteasy.util.DelegatingOutputStream;
+import org.reactivestreams.Publisher;
 
 /**
  * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@@ -162,7 +163,7 @@ public static <T> T extractResult(GenericType<T> responseType, Response response
             {
                T rtn = response.readEntity(responseType, annotations);
                if (InputStream.class.isInstance(rtn) || Reader.class.isInstance(rtn)
-                     || EventInput.class.isInstance(rtn))
+                     || EventInput.class.isInstance(rtn) || Publisher.class.isInstance(rtn))
                {
                   if (response instanceof ClientResponse)
                   {

diff --git a/...n/java/org/jboss/resteasy/client/jaxrs/internal/proxy/extractors/BodyEntityExtractor.java b/...n/java/org/jboss/resteasy/client/jaxrs/internal/proxy/extractors/BodyEntityExtractor.java
@@ -6,7 +6,9 @@
 import org.jboss.resteasy.client.jaxrs.i18n.Messages;
 import org.jboss.resteasy.client.jaxrs.internal.ClientInvocation;
 import org.jboss.resteasy.client.jaxrs.internal.ClientResponse;
+import org.jboss.resteasy.plugins.providers.sse.EventInput;
 import org.jboss.resteasy.spi.util.Types;
+import org.reactivestreams.Publisher;
 
 import javax.ws.rs.core.GenericType;
 
@@ -60,7 +62,7 @@ public Object extractEntity(ClientContext context, Object... args)
             gt = new GenericType(method.getReturnType());
          }
          Object obj = ClientInvocation.extractResult(gt, response, method.getAnnotations());
-         if (obj instanceof InputStream || obj instanceof Reader)
+         if (obj instanceof InputStream || obj instanceof Reader || obj instanceof Publisher || obj instanceof EventInput)
             releaseConnectionAfter = false;
          return obj;
       }

diff --git a/resteasy-core/src/main/java/org/jboss/resteasy/specimpl/BuiltResponse.java b/resteasy-core/src/main/java/org/jboss/resteasy/specimpl/BuiltResponse.java
@@ -12,10 +12,12 @@
 import org.jboss.resteasy.spi.util.Types;
 import org.jboss.resteasy.util.InputStreamToByteArray;
 import org.jboss.resteasy.util.ReadFromStream;
+import org.reactivestreams.Publisher;
 
 import javax.ws.rs.ProcessingException;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.ext.ReaderInterceptor;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -93,7 +95,7 @@ else if (bufferedEntity == null)
             {
                try
                {
-                  if (!EventInput.class.isInstance(entity))
+                  if (!Publisher.class.isInstance(entity) &&  !EventInput.class.isInstance(entity))
                   {
                      close();
                   }