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

Omaha #3708 fixed possible NPE in SiteConfigurationManager

Browse source 
Change-Id: Ic63d25ed626bec38fea2374c4122d29b44e064ab

Former-commit-id: b59d505a41 [formerly 847d9c9925] [formerly 158aa3f439] [formerly 158aa3f439 [formerly 180696a594]] [formerly b59d505a41 [formerly 847d9c9925] [formerly 158aa3f439] [formerly 158aa3f439 [formerly 180696a594]] [formerly 0a42113bbb [formerly 158aa3f439 [formerly 180696a594] [formerly 0a42113bbb [formerly 21924a6b536409681073f65d769bef53db049102]]]]]
Former-commit-id: 0a42113bbb
Former-commit-id: 9356ac3f94 [formerly 016b7763e8] [formerly 5c1e35dc2e] [formerly fb8dd5427008b37fe6bad7139df07fd90ce1ff4f [formerly 4ace24a1335d88e66758722a343dd206931cbc5d] [formerly 5c1e35dc2e [formerly a555477f7f]]]
Former-commit-id: f300549fc1718113c7434fcccf824c6f78fdb6ef [formerly e97dd8d4574e96113876fce9ea7291d8df9981fb] [formerly 5c756fa3f8 [formerly bf26a69d82]]
Former-commit-id: 5c756fa3f8
Former-commit-id: dbb499ca17
This commit is contained in:
Brian Clements 2014-10-14 13:48:44 -05:00
parent b56a907d9a
commit f9fd9ad168
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/SiteConfigurationManager.java
View file

@ -73,6 +73,7 @@ import com.raytheon.uf.viz.collaboration.comm.identity.info.SiteConfigInformatio
* Oct 10, 2014 3708 bclement refactored to support blacklisting
* moved color config to SiteColorConfigManager
* site level now combined with site config
* Oct 10, 2014 3708 bclement fixed possible NPE in getSiteConfig() getSiteVisibilityConfig()
*
* </pre>
*
@ -518,7 +519,8 @@ public class SiteConfigurationManager {
SiteConfigInformation siteInstance = getSiteConfigInformation();
if (siteInstance != null && siteInstance.getConfig() != null) {
for (SiteConfig config : siteInstance.getConfig()) {
if (config.getSite().equals(site)) {
String configSite = config.getSite();
if (configSite != null && configSite.equals(site)) {
rval = new SiteVisiblityConfig(config,
userSpecificConfigs);
break;
@ -573,7 +575,8 @@ public class SiteConfigurationManager {
SiteConfig rval = null;
if (info.getConfig() != null) {
for (SiteConfig config : info.getConfig()) {
if (config.getSite().equals(site)) {
String configSite = config.getSite();
if (configSite != null && configSite.equals(site)) {
rval = config;
break;
}