Merge "Issue #2721 Fix error when activeSites.txt contains blank lines." into development

Former-commit-id: 6b51b05bdf [formerly e665fa251dab6afb16d5a3863aac0815e84a00d4]
Former-commit-id: f3a6acaf48
This commit is contained in:
Ron Anderson 2014-03-10 18:07:17 -05:00 committed by Gerrit Code Review
commit 7b272e271c

View file

@ -63,6 +63,7 @@ import com.raytheon.uf.edex.site.SiteActivationMessage.Action;
* Nov 1, 2012 15417 ryu Modified getActiveSites to include
* home site only if activated.
* Dec 11, 2012 14360 ryu No printing stack trace on activation exception
* Mar 10, 2014 2721 randerso Fix error when activeSites.txt contains blank lines.
*
* </pre>
*
@ -297,7 +298,10 @@ public class SiteAwareRegistry {
in = new BufferedReader(new FileReader(file));
String site;
while ((site = in.readLine()) != null) {
activeSites.add(site);
site = site.trim();
if (!site.isEmpty()) {
activeSites.add(site);
}
}
}
} catch (IOException e) {