accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject git commit: ACCUMULO-1957 updates from last [~kturner] review
Date Tue, 09 Sep 2014 15:59:40 GMT
Repository: accumulo
Updated Branches:
  refs/heads/master c2ca6386a -> e355dc2fc


ACCUMULO-1957 updates from last [~kturner] review


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e355dc2f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e355dc2f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e355dc2f

Branch: refs/heads/master
Commit: e355dc2fc74fffa310f0b577a32d3c3968193d25
Parents: c2ca638
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Tue Sep 9 11:59:24 2014 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Tue Sep 9 11:59:39 2014 -0400

----------------------------------------------------------------------
 proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e355dc2f/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
----------------------------------------------------------------------
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
index 1dc1dd3..e2b52a5 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
@@ -1286,7 +1286,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
         cfg.setTimeout(opts.timeoutMs, TimeUnit.MILLISECONDS);
       if (opts.latencyMs != 0)
         cfg.setMaxLatency(opts.latencyMs, TimeUnit.MILLISECONDS);
-      if (opts.isSetDurability()) {
+      if (opts.isSetDurability() && opts.durability != null) {
         cfg.setDurability(getDurability(opts.getDurability()));
       }
     }
@@ -1308,7 +1308,7 @@ public class ProxyServer implements AccumuloProxy.Iface {
       case SYNC:
         return org.apache.accumulo.core.client.Durability.SYNC;
     }
-    return org.apache.accumulo.core.client.Durability.DEFAULT;
+    throw new IllegalArgumentException("Invalid durability value: " + durability.ordinal());
   }
 
   private IteratorSetting getIteratorSetting(org.apache.accumulo.proxy.thrift.IteratorSetting
setting) {


Mime
View raw message