commit b2ab0912148e73d2122972bff4a80687e6526563
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Nov 10 11:44:40 2014 -0800
committer Yuta HIGUCHI <y-higuchi@onlab.us> Mon Nov 10 11:45:59 2014 -0800
tree 8c37108daf78d73fe1b24a9241a1ac9849d8e829
parent 5d4b1c2f3ebdfbc2a35529b4af821dc9c2618925

DatabaseClient: check result status

Change-Id: I4f0ab20e42bf673b03035a1d9841af16eb67993f

core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java

diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java
index 8af567e..c2beb59 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/service/impl/DatabaseClient.java
@@ -39,7 +39,12 @@
                         Arrays.asList(tableName));
         CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            return (boolean) future.get().result();
+            final SubmitResponse submitResponse = future.get();
+            if (submitResponse.status() == Status.OK) {
+                return (boolean) submitResponse.result();
+            } else {
+                throw new DatabaseException(submitResponse.error());
+            }
         } catch (InterruptedException | ExecutionException e) {
             throw new DatabaseException(e);
         }
@@ -54,7 +59,7 @@
                         Arrays.asList(tableName));
         CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            if (future.get().status() == Status.OK) {
+            if (future.get().status() != Status.OK) {
                 throw new DatabaseException(future.get().toString());
             }
 
@@ -90,7 +95,12 @@
                         Arrays.asList());
         CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            return (List<String>) future.get().result();
+            final SubmitResponse submitResponse = future.get();
+            if (submitResponse.status() == Status.OK) {
+                return (List<String>) submitResponse.result();
+            } else {
+                throw new DatabaseException(submitResponse.error());
+            }
         } catch (InterruptedException | ExecutionException e) {
             throw new DatabaseException(e);
         }
@@ -106,8 +116,12 @@
 
         CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            List<InternalReadResult> internalReadResults = (List<InternalReadResult>) future.get().result();
-            return internalReadResults;
+            final SubmitResponse submitResponse = future.get();
+            if (submitResponse.status() == Status.OK) {
+                return (List<InternalReadResult>) submitResponse.result();
+            } else {
+                throw new DatabaseException(submitResponse.error());
+            }
         } catch (InterruptedException | ExecutionException e) {
             throw new DatabaseException(e);
         }
@@ -123,8 +137,12 @@
 
         CompletableFuture<SubmitResponse> future = client.submit(request);
         try {
-            List<InternalWriteResult> internalWriteResults = (List<InternalWriteResult>) future.get().result();
-            return internalWriteResults;
+            final SubmitResponse submitResponse = future.get();
+            if (submitResponse.status() == Status.OK) {
+                return (List<InternalWriteResult>) submitResponse.result();
+            } else {
+                throw new DatabaseException(submitResponse.error());
+            }
         } catch (InterruptedException | ExecutionException e) {
             throw new DatabaseException(e);
         }