Merge pull request #2204 from tomzo/2203-fix

#2203 properly handle null response from plugin
gocd · May 25, 2016 · d8f692f · d8f692f
2 parents 5bdb90d + 219f5fe
commit d8f692f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/plugin-infra/go-plugin-access/src/com/thoughtworks/go/plugin/access/PluginRequestHelper.java b/plugin-infra/go-plugin-access/src/com/thoughtworks/go/plugin/access/PluginRequestHelper.java
@@ -30,6 +30,9 @@ public <T> T submitRequest(String pluginId, String requestName, PluginInteractio
             apiRequest.setRequestBody(pluginInteractionCallback.requestBody(resolvedExtensionVersion));
             apiRequest.setRequestParams(pluginInteractionCallback.requestParams(resolvedExtensionVersion));
             GoPluginApiResponse response = pluginManager.submitTo(pluginId, apiRequest);
+            if(response == null){
+                throw new RuntimeException("The plugin sent a null response");
+            }
             if (DefaultGoApiResponse.SUCCESS_RESPONSE_CODE == response.responseCode()) {
                 return pluginInteractionCallback.onSuccess(response.responseBody(), resolvedExtensionVersion);
             }