NPE fix

Author: jprante

src/main/java/org/xbib/elasticsearch/action/plugin/jdbc/run/RunRiverResponse.java

@@ -22,6 +22,7 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.io.IOException;
+import java.util.Arrays;
 
 public class RunRiverResponse extends NodesOperationResponse implements ToXContent {
 
@@ -41,7 +42,7 @@ public boolean[] isExecuted() {
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
-        builder.field("executed", executed);
+        builder.field("executed", Arrays.asList(executed));
         return builder;
     }
 

src/main/java/org/xbib/elasticsearch/action/plugin/jdbc/state/get/GetRiverStateResponse.java

@@ -29,14 +29,15 @@
 
 public class GetRiverStateResponse extends ActionResponse implements ToXContent {
 
-    private ImmutableList<RiverState> states;
+    private ImmutableList<RiverState> states = ImmutableList.of();
 
     public GetRiverStateResponse() {
-        states = ImmutableList.of();
     }
 
     public GetRiverStateResponse(ImmutableList<RiverState> riverStates) {
-        states = riverStates;
+        if (riverStates != null) {
+            states = riverStates;
+        }
     }
 
     public RiverState getRiverState() {

src/main/java/org/xbib/elasticsearch/action/plugin/jdbc/state/get/TransportGetRiverStateAction.java

@@ -22,6 +22,7 @@
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
 import org.elasticsearch.cluster.block.ClusterBlockException;
+import org.elasticsearch.cluster.block.ClusterBlockLevel;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -64,7 +65,7 @@ protected void masterOperation(final GetRiverStateRequest request,
 
     @Override
     protected ClusterBlockException checkBlock(GetRiverStateRequest request, ClusterState state) {
-        return null;
+        return state.blocks().indexBlockedException(ClusterBlockLevel.METADATA, "");
     }
 
 }

src/main/java/org/xbib/elasticsearch/rest/action/river/jdbc/RestRiverStateAction.java

@@ -45,7 +45,7 @@ public class RestRiverStateAction extends BaseRestHandler {
     private final Client client;
 
     @Inject
-    public RestRiverStateAction(Settings settings, Client client, RestController controller) {
+    public RestRiverStateAction(Settings settings,  RestController controller, Client client) {
         super(settings, controller, client);
         this.client = client;
 
@@ -85,6 +85,7 @@ public void handleRequest(RestRequest request, RestChannel channel) throws Excep
                 try {
                     channel.sendResponse(new BytesRestResponse(channel, t));
                 } catch (IOException e) {
+                    logger.error(e.getMessage(), e);
                     channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR));
                 }
             }
@@ -131,6 +132,7 @@ public void handleRequest(RestRequest request, RestChannel channel) throws Excep
                 try {
                     channel.sendResponse(new BytesRestResponse(channel, t));
                 } catch (IOException e) {
+                    logger.error(e.getMessage(), e);
                     channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR));
                 }
             }
@@ -153,6 +155,7 @@ public void handleRequest(RestRequest request, RestChannel channel) throws Excep
                 try {
                     channel.sendResponse(new BytesRestResponse(channel, t));
                 } catch (IOException e) {
+                    logger.error(e.getMessage(), e);
                     channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR));
                 }
             }

src/main/java/org/xbib/elasticsearch/rest/action/river/jdbc/RestRunRiverAction.java

@@ -53,12 +53,11 @@ protected void handleRequest(RestRequest request, RestChannel channel, Client cl
             runRiverRequest.setRiverName(riverName).setRiverType(riverType);
             client.admin().cluster().execute(RunRiverAction.INSTANCE, runRiverRequest,
                     new RestToXContentListener<RunRiverResponse>(channel));
-            XContentBuilder builder = jsonBuilder().startObject().field("ok", true).endObject();
-            channel.sendResponse(new BytesRestResponse(RestStatus.OK, builder));
         } catch (Throwable t) {
             try {
                 channel.sendResponse(new BytesRestResponse(channel, t));
-            } catch (IOException e1) {
+            } catch (IOException e) {
+                logger.error(e.getMessage(), e);
                 channel.sendResponse(new BytesRestResponse(RestStatus.INTERNAL_SERVER_ERROR));
             }
         }