Merge "Issue #1438 fix problems reading a non existent grid alias file." into development

Former-commit-id: dc156f69c4 [formerly 61700b2f37] [formerly dc156f69c4 [formerly 61700b2f37] [formerly 19fc9e2bbc [formerly 3880bfbd8bf84a9ed4ba93b785b2a45f3af35f81]]]
Former-commit-id: 19fc9e2bbc
Former-commit-id: 0a585a9498 [formerly 5e9f24b527]
Former-commit-id: 693548c7d2
This commit is contained in:
Ron Anderson 2013-01-08 10:36:19 -06:00 committed by Gerrit Code Review
commit deeb9ab71b

View file

@ -303,7 +303,7 @@ public class GribModelLookup {
"/grid/dataset/alias/gfeParamInfo.xml");
AliasList al = null;
if (baseFile.exists()) {
al = JAXB.unmarshal(file.getFile(), AliasList.class);
al = JAXB.unmarshal(baseFile.getFile(), AliasList.class);
al.getAliasList().addAll(aliasList);
} else {
al = new AliasList();