[FIXED JENKINS-10626] Ignore files that could not be read.

jenkinsci · Aug 19, 2011 · dd79186 · dd79186
1 parent 5c2a29c
commit dd79186
Showing 1 changed file with 28 additions and 20 deletions.
diff --git a/src/main/java/hudson/plugins/tasks/parser/WorkspaceScanner.java b/src/main/java/hudson/plugins/tasks/parser/WorkspaceScanner.java
@@ -136,28 +136,31 @@ public TasksParserResult invoke(final File workspace, final VirtualChannel chann
         TasksParserResult javaProject = new TasksParserResult(files.length);
         ModuleDetector moduleDetector = createModuleDetector(workspace);
         for (String fileName : files) {
-            File originalFile = new File(workspace, fileName);
-            Collection<Task> tasks = taskScanner.scan(new InputStreamReader(new FilePath(originalFile).read(),
-                    EncodingValidator.defaultCharset(defaultEncoding)));
-            if (!tasks.isEmpty()) {
-                String unixName = fileName.replace('\\', '/');
-                String packageName = PackageDetectors.detectPackage(unixName, new FilePath(originalFile).read());
-                String guessedModule = moduleDetector.guessModuleName(originalFile.getAbsolutePath());
-                String actualModule = StringUtils.defaultIfEmpty(moduleName, guessedModule);
-
-                for (Task task : tasks) {
-                    task.setFileName(originalFile.getAbsolutePath());
-                    task.setPackageName(packageName);
-                    task.setModuleName(actualModule);
-                    task.setPathName(workspace.getPath());
-
-                    ContextHashCode hashCode = new ContextHashCode();
-                    task.setContextHashCode(hashCode.create(originalFile.getAbsolutePath(), task.getPrimaryLineNumber(), defaultEncoding));
+            try {
+                File originalFile = new File(workspace, fileName);
+                Collection<Task> tasks = taskScanner.scan(readFile(originalFile));
+                if (!tasks.isEmpty()) {
+                    String unixName = fileName.replace('\\', '/');
+                    String packageName = PackageDetectors.detectPackage(unixName, new FilePath(originalFile).read());
+                    String guessedModule = moduleDetector.guessModuleName(originalFile.getAbsolutePath());
+                    String actualModule = StringUtils.defaultIfEmpty(moduleName, guessedModule);
+
+                    for (Task task : tasks) {
+                        task.setFileName(originalFile.getAbsolutePath());
+                        task.setPackageName(packageName);
+                        task.setModuleName(actualModule);
+                        task.setPathName(workspace.getPath());
+
+                        ContextHashCode hashCode = new ContextHashCode();
+                        task.setContextHashCode(hashCode.create(originalFile.getAbsolutePath(), task.getPrimaryLineNumber(), defaultEncoding));
+                    }
+
+                    javaProject.addAnnotations(tasks);
                 }
-
-                javaProject.addAnnotations(tasks);
             }
-
+            catch (IOException exception) {
+                // ignore files that could not be read
+            }
             if (Thread.interrupted()) {
                 throw new InterruptedException("Canceling scanning since build has been aborted.");
             }
@@ -166,6 +169,11 @@ public TasksParserResult invoke(final File workspace, final VirtualChannel chann
         return javaProject;
     }
 
+    private InputStreamReader readFile(final File originalFile) throws IOException {
+        return new InputStreamReader(new FilePath(originalFile).read(),
+                    EncodingValidator.defaultCharset(defaultEncoding));
+    }
+
     private ModuleDetector createModuleDetector(final File workspace) {
         if (shouldDetectModules) {
             return new ModuleDetector(workspace);