[798006] Drift detection hangs on reading named pipes on filesystem

Protect against drift detection on not "normal" files.
rhq-project · Apr 21, 2014 · 7e9ce1d · 7e9ce1d
1 parent 4cfb114
commit 7e9ce1d
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java b/modules/core/plugin-container/src/main/java/org/rhq/core/pc/drift/DriftDetector.java
@@ -71,9 +71,7 @@ public class DriftDetector implements Runnable {
 
     private final DriftClient driftClient;
 
-    public DriftDetector(ScheduleQueue scheduleQueue,
-            ChangeSetManager changeSetMgr,
-            DriftClient driftClient) {
+    public DriftDetector(ScheduleQueue scheduleQueue, ChangeSetManager changeSetMgr, DriftClient driftClient) {
         this.scheduleQueue = scheduleQueue;
         this.changeSetMgr = changeSetMgr;
         this.driftClient = driftClient;
@@ -212,10 +210,14 @@ private void generateDriftChangeSet(DriftDetectionSummary summary) throws IOExce
                 forEachFile(dir, new FilterFileVisitor(basedir, includes, excludes, new FileVisitor() {
                     @Override
                     public void visit(File file) {
-                        if (file.canRead()) {
-                            newFiles.add(file);
+                        if (file.isFile()) {
+                            if (file.canRead()) {
+                                newFiles.add(file);
+                            } else if (log.isDebugEnabled()) {
+                                log.debug("Skipping " + file.getPath() + " as new file since it is not readable.");
+                            }
                         } else if (log.isDebugEnabled()) {
-                            log.debug("Skipping " + file.getPath() + " as new file since it is not readable.");
+                            log.debug("Skipping " + file.getPath() + " as new file since it is not a normal file.");
                         }
                     }
                 }));