xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #3036 Added check for archive's root directories.

Browse source 
Former-commit-id: 3259d4d44d [formerly f344acf3572150c7470ab1e3c3bbb356166c78ff]
Former-commit-id: 7a2775ecbc
This commit is contained in:
Roger Ferrel 2014-04-29 14:14:20 -05:00
parent abb14c67e7
commit 039e4b5209
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
View file

@ -96,6 +96,7 @@ import com.raytheon.uf.common.util.FileUtil;
* Mar 21, 2014 2835 rjpeter Optimized getDisplayData to only scan directories to the depth required to
* populate the display label.
* Apr 01, 2014 2862 rferrel Moved purge only routines to ArchivePurgeManager.
* Apr 29, 2014 3036 rferrel Check for missing archive root directories.
* </pre>
*
* @author rferrel
@ -578,7 +579,12 @@ public class ArchiveConfigManager {
List<File> dirList = polledDirs.get(dir);
if (dirList == null) {
File[] list = dir.listFiles();
dirList = Arrays.asList(list);
// Missing directory.
if (list == null) {
dirList = new ArrayList<File>(0);
} else {
dirList = Arrays.asList(list);
}
polledDirs.put(dir, dirList);
}
@ -732,6 +738,13 @@ public class ArchiveConfigManager {
}
File rootFile = new File(rootDirName);
if (!(rootFile.isDirectory() && rootFile.canRead())) {
statusHandler.handle(
Priority.ERROR,
"Unable to access archive directory: "
+ rootFile.getAbsolutePath());
}
TreeMap<String, Map<CategoryDataSet, Set<File>>> displays = new TreeMap<String, Map<CategoryDataSet, Set<File>>>();
Map<CategoryDataSet, List<File>> dirMap = getDirs(rootFile,
categoryConfig, maxDepth);