CHE-5505: Fix NPE in DockerConnector (#5510)

eclipse-che · Jun 30, 2017 · f0717e0 · f0717e0
1 parent 003804d
commit f0717e0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/...gin-docker-client/src/main/java/org/eclipse/che/plugin/docker/client/DockerConnector.java b/...gin-docker-client/src/main/java/org/eclipse/che/plugin/docker/client/DockerConnector.java
@@ -1346,15 +1346,25 @@ private String getBuildImageId(ProgressStatus progressStatus) {
 
     protected <T> T parseResponseStreamAndClose(InputStream inputStream, Class<T> clazz) throws IOException {
         try (InputStreamReader reader = new InputStreamReader(inputStream)) {
-            return GSON.fromJson(reader, clazz);
+            T objectFromJson = GSON.fromJson(reader, clazz);
+            if (objectFromJson == null) {
+                LOG.error("Docker response doesn't contain any data, though it was expected to contain some.");
+                throw new IOException("Internal server error. Unexpected response body received from Docker.");
+            }
+            return objectFromJson;
         } catch (JsonParseException e) {
             throw new IOException(e.getLocalizedMessage(), e);
         }
     }
 
     protected <T> T parseResponseStreamAndClose(InputStream inputStream, TypeToken<T> tt) throws IOException {
         try (InputStreamReader reader = new InputStreamReader(inputStream)) {
-            return GSON.fromJson(reader, tt.getType());
+            T objectFromJson = GSON.fromJson(reader, tt.getType());
+            if (objectFromJson == null) {
+                LOG.error("Docker response doesn't contain any data, though it was expected to contain some.");
+                throw new IOException("Internal server error. Unexpected response body received from Docker.");
+            }
+            return objectFromJson;
         } catch (JsonParseException e) {
             throw new IOException(e.getLocalizedMessage(), e);
         }

diff --git a/...docker-client/src/test/java/org/eclipse/che/plugin/docker/client/DockerConnectorTest.java b/...docker-client/src/test/java/org/eclipse/che/plugin/docker/client/DockerConnectorTest.java
@@ -1617,6 +1617,19 @@ public void shouldBeAbleToParseResponseStreamAsEmptyListOfContainersAndClose() t
         assertEquals(containers.size(), 0);
     }
 
+    @Test(expectedExceptions = IOException.class,
+          expectedExceptionsMessageRegExp = "Internal server error. Unexpected response body received from Docker.")
+    public void shouldThrowIOExceptionWhenParseEmptyResponseStringByClass() throws IOException {
+        dockerConnector.parseResponseStreamAndClose(new ByteArrayInputStream("".getBytes()), Version.class);
+    }
+
+    @Test(expectedExceptions = IOException.class,
+          expectedExceptionsMessageRegExp = "Internal server error. Unexpected response body received from Docker.")
+    public void shouldThrowIOExceptionWhenParseEmptyResponseStringByTypeToken() throws IOException {
+        dockerConnector.parseResponseStreamAndClose(new ByteArrayInputStream("".getBytes()),
+                                                    new TypeToken<List<ContainerListEntry>>() {});
+    }
+
     @Test
     public void shouldBeAbleToGetNetworks() throws Exception {
         // given