Alon Bar-Lev has uploaded a new change for review. Change subject: utils: LocalConfig: support empty file names ......................................................................
utils: LocalConfig: support empty file names Change-Id: I7d24fd11e1909b4b91cc7a2be8494761eaba9a14 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java 1 file changed, 31 insertions(+), 26 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/16582/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java index 47f5724..4c1bb4b 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/LocalConfig.java @@ -16,6 +16,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; /** @@ -57,37 +58,41 @@ // configuration files to merge, the defaults and the variables): List<File> configFiles = new ArrayList<File>(2); - File defaultsFile = new File(defaultsPath); - configFiles.add(defaultsFile); + if (!StringUtils.isEmpty(defaultsPath)) { + File defaultsFile = new File(defaultsPath); + configFiles.add(defaultsFile); + } - File varsFile = new File(varsPath); - configFiles.add(varsFile); + if (!StringUtils.isEmpty(varsPath)) { + File varsFile = new File(varsPath); + configFiles.add(varsFile); - // Locate the override values directory and add the .conf files inside - // to the list, sorted alphabetically: - File varsDir = new File(varsPath + ".d"); - if (varsDir.isDirectory()) { - File[] varsFiles = varsDir.listFiles( - new FilenameFilter() { - @Override - public boolean accept(File parent, String name) { - return name.endsWith(".conf"); + // Locate the override values directory and add the .conf files inside + // to the list, sorted alphabetically: + File varsDir = new File(varsPath + ".d"); + if (varsDir.isDirectory()) { + File[] varsFiles = varsDir.listFiles( + new FilenameFilter() { + @Override + public boolean accept(File parent, String name) { + return name.endsWith(".conf"); + } } - } - ); - Arrays.sort( - varsFiles, - new Comparator<File>() { - @Override - public int compare (File leftFile, File rightFile) { - String leftName = leftFile.getName(); - String rightName = rightFile.getName(); - return leftName.compareTo(rightName); + ); + Arrays.sort( + varsFiles, + new Comparator<File>() { + @Override + public int compare (File leftFile, File rightFile) { + String leftName = leftFile.getName(); + String rightName = rightFile.getName(); + return leftName.compareTo(rightName); + } } + ); + for (File file : varsFiles) { + configFiles.add(file); } - ); - for (File file : varsFiles) { - configFiles.add(file); } } -- To view, visit http://gerrit.ovirt.org/16582 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d24fd11e1909b4b91cc7a2be8494761eaba9a14 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
