svn commit: r1229220 - /incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java

[bi...@apache.org]

Author: billie
Date: Mon Jan  9 15:42:43 2012
New Revision: 1229220

URL: http://svn.apache.org/viewvc?rev=1229220&view=rev
Log:
ACCUMULO-291 fixed TableOperationsHelper in 1.4

Modified:
    incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java

Modified: incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java?rev=1229220&r1=1229219&r2=1229220&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java (original)
+++ incubator/accumulo/branches/1.4/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsHelper.java Mon Jan  9 15:42:43 2012
@@ -38,10 +38,10 @@ public abstract class TableOperationsHel
     checkIteratorConflicts(tableName, setting);
     for (IteratorScope scope : setting.getScopes()) {
       String root = String.format("%s%s.%s", Property.TABLE_ITERATOR_PREFIX, scope.name().toLowerCase(), setting.getName());
-      this.setProperty(tableName, root, setting.getPriority() + "," + setting.getIteratorClass());
       for (Entry<String,String> prop : setting.getProperties().entrySet()) {
         this.setProperty(tableName, root + ".opt." + prop.getKey(), prop.getValue());
       }
+      this.setProperty(tableName, root, setting.getPriority() + "," + setting.getIteratorClass());
     }
   }
   
@@ -50,7 +50,7 @@ public abstract class TableOperationsHel
       TableNotFoundException {
     if (!exists(tableName))
       throw new TableNotFoundException(null, tableName, null);
-    Map<String,String> copy = new HashMap<String,String>();
+    Map<String,String> copy = new TreeMap<String,String>();
     for (Entry<String,String> property : this.getProperties(tableName)) {
       copy.put(property.getKey(), property.getValue());
     }