svn commit: r1333543 - in /accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core: client/admin/TableOperationsImpl.java conf/AccumuloConfiguration.java

[vines]

Author: vines
Date: Thu May  3 16:43:57 2012
New Revision: 1333543

URL: http://svn.apache.org/viewvc?rev=1333543&view=rev
Log:
ACCUMULO-567 - minor fix to allow propogation of the instance used. This is a 
non-issue in future versions due to rewrite, so while there be an even better 
solution, I'm not going to waste time on it.

Modified:
    
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
    
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java

Modified: 
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java?rev=1333543&r1=1333542&r2=1333543&view=diff
==============================================================================
--- 
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
 (original)
+++ 
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
 Thu May  3 16:43:57 2012
@@ -541,7 +541,7 @@ public class TableOperationsImpl extends
    */
   public Iterable<Entry<String,String>> getProperties(String tableName) throws 
TableNotFoundException {
     ArgumentChecker.notNull(tableName);
-    return 
AccumuloConfiguration.getTableConfiguration(instance.getInstanceID(), 
Tables.getTableId(instance, tableName));
+    return 
AccumuloConfiguration.getTableConfiguration(instance.getInstanceID(), 
Tables.getTableId(instance, tableName), instance);
   }
   
   /**

Modified: 
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java?rev=1333543&r1=1333542&r2=1333543&view=diff
==============================================================================
--- 
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
 (original)
+++ 
accumulo/branches/1.3/src/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
 Thu May  3 16:43:57 2012
@@ -143,10 +143,14 @@ public abstract class AccumuloConfigurat
   }
   
   public static TableConfiguration getTableConfiguration(String instanceId, 
String tableId) {
+    return AccumuloConfiguration.getTableConfiguration(instanceId, tableId, 
null);
+  }
+
+  public static TableConfiguration getTableConfiguration(String instanceId, 
String tableId, Instance instance) {
     synchronized (tableInstances) {
       TableConfiguration conf = tableInstances.get(tableId);
       if (conf == null) {
-        conf = new TableConfiguration(instanceId, tableId, 
getZooConfiguration());
+        conf = new TableConfiguration(instanceId, tableId, 
getZooConfiguration(instance));
         ConfigSanityCheck.validate(conf);
         tableInstances.put(tableId, conf);
       }