You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2011/12/27 21:39:36 UTC
svn commit: r1225009 - in /incubator/accumulo/trunk: ./
src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
Author: ecn
Date: Tue Dec 27 20:39:36 2011
New Revision: 1225009
URL: http://svn.apache.org/viewvc?rev=1225009&view=rev
Log:
ACCUMULO-232 check for missing default values when printing config table
Modified:
incubator/accumulo/trunk/ (props changed)
incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
Propchange: incubator/accumulo/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 27 20:39:36 2011
@@ -1,3 +1,3 @@
-/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320
+/incubator/accumulo/branches/1.3:1190280,1190413,1190420,1190427,1190500,1195622,1195625,1195629,1195635,1196044,1196054,1196057,1196071-1196072,1196106,1197066,1198935,1199383,1203683,1204625,1205547,1205880,1206169,1208031,1209124,1209526,1209532,1209539,1209541,1209587,1209657,1210518,1210571,1210596,1210598,1213424,1214320,1225006
/incubator/accumulo/branches/1.3.5rc:1209938
-/incubator/accumulo/branches/1.4:1201902-1222706
+/incubator/accumulo/branches/1.4:1201902-1222706,1225007
Modified: incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java?rev=1225009&r1=1225008&r2=1225009&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java (original)
+++ incubator/accumulo/trunk/src/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java Tue Dec 27 20:39:36 2011
@@ -170,11 +170,11 @@ public class ConfigCommand extends Comma
printed = true;
}
if (!defaults.containsKey(key) || !defaults.get(key).equals(siteVal)) {
- printConfLine(output, "site", printed ? " @override" : key, siteVal);
+ printConfLine(output, "site", printed ? " @override" : key, siteVal == null ? "" : siteVal);
printed = true;
}
if (!siteConfig.containsKey(key) || !siteVal.equals(sysVal)) {
- printConfLine(output, "system", printed ? " @override" : key, sysVal);
+ printConfLine(output, "system", printed ? " @override" : key, sysVal == null ? "" : sysVal);
printed = true;
}
}