HADOOP-6836. svn merge -c 964134 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@964135 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -908,6 +908,9 @@ Release 0.21.0 - 2010-07-01
 
   BUG FIXES
 
+    HADOOP-6836. [Herriot]: Generic method for adding/modifying the attributes
+    for new configuration. (Vinay Thota via cos)
+
     HADOOP-6839. [Herriot] Implement a functionality for getting the user list
     for creating proxy users. (Vinay Thota via cos)
 

src/test/system/java/org/apache/hadoop/test/system/AbstractDaemonCluster.java

@@ -347,7 +347,7 @@ public abstract class AbstractDaemonCluster {
    * @param configFile configuration file.
    * @throws IOException if an I/O error occurs.
    */
-  public void restartClusterWithNewConfig(Hashtable<String,Long> props, 
+  public void restartClusterWithNewConfig(Hashtable<String,?> props, 
       String configFile) throws IOException {
 
     String mapredConf = null;
@@ -359,8 +359,8 @@ public abstract class AbstractDaemonCluster {
     Enumeration<String> e = props.keys();
     while (e.hasMoreElements()) {
       String propKey = e.nextElement();
-      Long propValue = props.get(propKey);
-      initConf.setLong(propKey,propValue.longValue());
+      Object propValue = props.get(propKey);
+      initConf.set(propKey,propValue.toString());
     }
 
     localDirPath = getHadoopLocalConfDir();