accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [1/2] git commit: ACCUMULO-1565 applying Sean Hickey's patch
Date Mon, 29 Jul 2013 14:26:02 GMT
Updated Branches:
  refs/heads/master 5e0d7e7ba -> f479cad58


ACCUMULO-1565 applying Sean Hickey's patch


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

Branch: refs/heads/master
Commit: 3d06f475ebfcb4da9789ab30c22b9d7b2ab47ddf
Parents: 260b431
Author: Eric Newton <ecn@apache.org>
Authored: Mon Jul 29 10:23:06 2013 -0400
Committer: Eric Newton <ecn@apache.org>
Committed: Mon Jul 29 10:23:06 2013 -0400

----------------------------------------------------------------------
 .../apache/accumulo/core/client/admin/TableOperationsImpl.java   | 2 +-
 .../src/main/java/org/apache/accumulo/server/master/Master.java  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d06f475/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
index 3ad4217..74a90e9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
@@ -681,7 +681,7 @@ public class TableOperationsImpl extends TableOperationsHelper {
     Map<String,String> opts = new HashMap<String,String>();
     opts.putAll(propertiesToSet);
     for (String prop : propertiesToExclude)
-      opts.put(prop, null);
+      opts.put(prop, "");
     
     doTableOperation(TableOperation.CLONE, args, opts);
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3d06f475/server/src/main/java/org/apache/accumulo/server/master/Master.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java
index e15202b..35c30bf 100644
--- a/server/src/main/java/org/apache/accumulo/server/master/Master.java
+++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java
@@ -647,7 +647,7 @@ public class Master implements LiveTServerSet.Listener, TableObserver,
CurrentSt
         throw new ThriftSecurityException(c.getPrincipal(), SecurityErrorCode.PERMISSION_DENIED);
       
       try {
-        if (value == null) {
+        if (value == null || value.isEmpty()) {
           TablePropUtil.removeTableProperty(tableId, property);
         } else if (!TablePropUtil.setTableProperty(tableId, property, value)) {
           throw new Exception("Invalid table property.");
@@ -844,7 +844,7 @@ public class Master implements LiveTServerSet.Listener, TableObserver,
CurrentSt
           Set<String> propertiesToExclude = new HashSet<String>();
           
           for (Entry<String,String> entry : options.entrySet()) {
-            if (entry.getValue() == null) {
+            if (entry.getValue() == null || entry.getValue().isEmpty()) {
               propertiesToExclude.add(entry.getKey());
               continue;
             }


Mime
View raw message