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

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

Browse source 
Former-commit-id: 116826d0f8 [formerly bd57a18a29] [formerly 6b51b05bdf] [formerly 116826d0f8 [formerly bd57a18a29] [formerly 6b51b05bdf] [formerly f3a6acaf48 [formerly 6b51b05bdf [formerly e665fa251dab6afb16d5a3863aac0815e84a00d4]]]]
Former-commit-id: f3a6acaf48
Former-commit-id: c8ecb9a934 [formerly d6d544bc3b] [formerly fb4aba70507fc50b99a5a3d974471405f7dc99ef [formerly 7b272e271c]]
Former-commit-id: bd60ee87653f0192f19731592bfd66a8b44e519b [formerly 9d60bad8f7]
Former-commit-id: 178a11fc31
This commit is contained in:
Ron Anderson 2014-03-10 18:07:17 -05:00 • committed by Gerrit Code Review
commit bc8476d4cb
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/com.raytheon.uf.edex.site/src/com/raytheon/uf/edex/site/SiteAwareRegistry.java
View file

@ -63,6 +63,7 @@ import com.raytheon.uf.edex.site.SiteActivationMessage.Action;
* Nov 1, 2012 15417 ryu Modified getActiveSites to include * Nov 1, 2012 15417 ryu Modified getActiveSites to include
* home site only if activated. * home site only if activated.
* Dec 11, 2012 14360 ryu No printing stack trace on activation exception * 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> * </pre>
* *
@ -297,9 +298,12 @@ public class SiteAwareRegistry {
in = new BufferedReader(new FileReader(file)); in = new BufferedReader(new FileReader(file));
String site; String site;
while ((site = in.readLine()) != null) { while ((site = in.readLine()) != null) {
site = site.trim();
if (!site.isEmpty()) {
activeSites.add(site); activeSites.add(site);
} }
} }
}
} catch (IOException e) { } catch (IOException e) {
statusHandler.handle(Priority.PROBLEM, statusHandler.handle(Priority.PROBLEM,
"Error loading active sites", e); "Error loading active sites", e);