Alon Bar-Lev has uploaded a new change for review.

Change subject: utils: cleanup: LocalConfig: relay on File.listFiles() return 
value
......................................................................

utils: cleanup: LocalConfig: relay on File.listFiles() return value

make coverity happy by not check if file is directory before listFiles,
but relay on the listFiles return code.

Change-Id: I2308e1e58ffb778aea5100df577d636d96acfa8f
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, 8 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/19237/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 003b1d9..b53dc75 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
@@ -71,16 +71,15 @@
 
             // 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");
-                        }
+            File[] varsFiles = new File(varsPath + ".d").listFiles(
+                new FilenameFilter() {
+                    @Override
+                    public boolean accept(File parent, String name) {
+                        return name.endsWith(".conf");
                     }
-                );
+                }
+            );
+            if (varsFiles != null) {
                 Arrays.sort(
                     varsFiles,
                     new Comparator<File>() {


-- 
To view, visit http://gerrit.ovirt.org/19237
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2308e1e58ffb778aea5100df577d636d96acfa8f
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

Reply via email to