diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-09-25 15:52:24 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-09-25 15:53:55 -0400 |
| commit | 3a2b5c60384feb490e878020bdb9c01f514d7856 (patch) | |
| tree | 840d02d1090640b08aa481f52d3385ad92552991 /ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java | |
| parent | 65c475eb72271f674f5ec4502fa67fd972344543 (diff) | |
Sonar Scans and Role Centralization; clean nl
PORTAL-21: centralized user role management
PORTAL-72: Address Sonar Scan code issues for ONAP - mostly on raptor
PORTAL-86: ONAP - Remove internal att.com usages from tests and otherfiles
PORTAL-90: Add debug statements to demo app's class; no functional change
Issue: PORTAL-21 PORTAL-72 PORTAL-86 PORTAL-90
Change-Id: I72a6c812009f51446330bf42bab6d3338d053805
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java')
| -rw-r--r-- | ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java index 2b01821e..f9d58fee 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/ReportRuntime.java @@ -2815,7 +2815,7 @@ public List getMapMarkers(ReportData rd, org.onap.portalsdk.analytics.xmlobj.Rep } } if(!ff.hasPredefinedList) { - if(oldSQL != null && !oldSQL.equals("")) { + if(oldSQL != null && !oldSQL.equals("") && lookup!=null) { ((IdNameSql)lookup).setSQL(oldSQL); } } @@ -2970,7 +2970,7 @@ public List getMapMarkers(ReportData rd, org.onap.portalsdk.analytics.xmlobj.Rep } } if(!ff.hasPredefinedList) { - if(oldSQL != null && !oldSQL.equals("")) { + if(oldSQL != null && !oldSQL.equals("") && lookup!=null) { ((IdNameSql)lookup).setSQL(oldSQL); } } |