Merge "JERSEY-2843 (PR#138) Reverted as it conflicts with JAX-RS specification."

Author: Marek Potociar

core-common/src/main/java/org/glassfish/jersey/message/internal/InboundMessageContext.java

@@ -743,6 +743,8 @@ public void setWorkers(MessageBodyWorkers workers) {
      *         {@code false} otherwise.
      */
     public boolean hasEntity() {
+        entityContent.ensureNotClosed();
+
         try {
             return !entityContent.isEmpty();
         } catch (IllegalStateException ex) {

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/client/ResponseCloseTest.java

@@ -49,7 +49,6 @@
 import org.glassfish.jersey.test.JerseyTest;
 
 import org.junit.Test;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
 /**
@@ -160,10 +159,10 @@ public void testHasEntityAfterClose() {
         final Response response = target().path("simple").request().get(Response.class);
         response.close();
         try {
-            final boolean hasEntity = response.hasEntity();
-            assertFalse("Should return false when the connection is already closed", hasEntity);
-        } catch (final IllegalStateException ex) {
+            response.hasEntity();
             fail("IllegalStateException should have been caught inside hasEntity.");
+        } catch (final IllegalStateException ex) {
+            // expected
         }
     }
 }