summaryrefslogtreecommitdiffstats
path: root/auth/auth-gui/src/main/java/org
diff options
context:
space:
mode:
authorInstrumental <jonathan.gathman@att.com>2019-05-31 15:08:37 -0500
committerInstrumental <jonathan.gathman@att.com>2019-05-31 15:13:25 -0500
commitdbec47530c91b6cd586fb05b44fd27444301e04a (patch)
tree85bd688449a2ea3d52d585e2b3dbd84a6168e861 /auth/auth-gui/src/main/java/org
parent98adb75e5e627d28ecdf659f4c8ed640ce53ed5e (diff)
Switch to new Locate Features
Issue-ID: AAF-839 Change-Id: I3122d32330c7e0fab533db8355183dbff68f7cc7 Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'auth/auth-gui/src/main/java/org')
-rw-r--r--auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java
index 8924ba26..5b6eb016 100644
--- a/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java
+++ b/auth/auth-gui/src/main/java/org/onap/aaf/auth/gui/Page.java
@@ -261,7 +261,7 @@ public class Page extends HTMLCacheGen {
});
hgen.html();
final String title = env.getProperty(AAF_GUI_TITLE,"Authentication/Authorization Framework");
- final String defaultTheme = env.get(sTheme);
+ final String defaultTheme = env.get(sTheme,"onap");
final Holder<String> hTheme = new Holder<>(defaultTheme);
Mark head = hgen.head();
@@ -368,7 +368,7 @@ public class Page extends HTMLCacheGen {
cache.dynamic(hgen, new DynamicCode<HTMLGen,AAF_GUI,AuthzTrans>() {
@Override
public void code(AAF_GUI state, AuthzTrans trans,Cache<HTMLGen> cache, HTMLGen xgen) throws APIException, IOException {
- Properties props = themeProps.get(hTheme.get());
+ Properties props = themeProps==null?null:themeProps.get(hTheme.get());
if(props!=null && "TRUE".equalsIgnoreCase(props.getProperty("main_menu_in_nav"))) {
xgen.incr("h2").text("Navigation").end();
Mark mark = new Mark();