Address comments from @svanoort

jenkinsci · Jun 14, 2017 · c0fe4b4 · c0fe4b4
1 parent 4498570
commit c0fe4b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/ConfigOnly.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/ConfigOnly.java
@@ -112,12 +112,7 @@ private void addUserFiles(File rootDir, List<File> filesToBackup) throws Periodi
         File usersDir = new File(rootDir, "users");
         if (usersDir.exists() && usersDir.isDirectory()) {
             // Each user directory should have a config.xml file
-            File[] dirsInUsers = usersDir.listFiles((FileFilter) FileFilterUtils.directoryFileFilter());
-            if (dirsInUsers == null) {
-                // First one may happen only due to the race condition
-                throw new PeriodicBackupException("Job directory path does not denote or there is an I/O error");
-            }
-
+            File[] dirsInUsers =  Util.listFiles(usersDir, FileFilterUtils.directoryFileFilter());
             for (File user : dirsInUsers) {
                 File userConfig = new File(user, "config.xml");
                 if (userConfig.exists() && userConfig.isFile()) {

diff --git a/src/main/java/org/jenkinsci/plugins/periodicbackup/Util.java b/src/main/java/org/jenkinsci/plugins/periodicbackup/Util.java
@@ -183,7 +183,7 @@ public static File[] listFiles(@Nonnull File directory, @CheckForNull FileFilter
         try {
             files = fileFilter == null ? directory.listFiles() : directory.listFiles(fileFilter);
         } catch(SecurityException ex) {
-            throw new PeriodicBackupException(formatMessage(directory, "Securiy exception while listing files"), ex);
+            throw new PeriodicBackupException(formatMessage(directory, "Security exception while listing files"), ex);
         }
 
         if (files == null) {