aboutsummaryrefslogtreecommitdiffstats
path: root/epsdk-app-onap/src
diff options
context:
space:
mode:
Diffstat (limited to 'epsdk-app-onap/src')
-rw-r--r--epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java11
-rw-r--r--epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java4
2 files changed, 11 insertions, 4 deletions
diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index 7c1b5c693..ca317dde2 100644
--- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
+++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
@@ -37,11 +37,12 @@
*/
package org.onap.portalapp.conf;
+import java.util.TimeZone;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
import org.onap.portalsdk.core.conf.AppInitializer;
import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import java.util.TimeZone;
-
public class ExternalAppInitializer extends AppInitializer {
private static final EELFLoggerDelegate LOG = EELFLoggerDelegate.getLogger(ExternalAppInitializer.class);
@@ -54,6 +55,12 @@ public class ExternalAppInitializer extends AppInitializer {
return new Class[] { appConfigClass };
}
+ @Override
+ public void onStartup(ServletContext servletContext) throws ServletException {
+ super.onStartup(servletContext);
+ setDefaultTimeZoneToUTC();
+ }
+
//set time zone to UTC so Dates would be written to DB in UTC timezone
private void setDefaultTimeZoneToUTC() {
System.setProperty("user.timezone", "UTC");
diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java
index 9f8f7279a..02fbfa96d 100644
--- a/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java
+++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/scheduler/RegistryAdapter.java
@@ -3,6 +3,7 @@
* ONAP Portal SDK
* ===================================================================
* Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ===================================================================
*
* Unless otherwise specified, all software contained herein is licensed
@@ -74,8 +75,7 @@ public class RegistryAdapter {
public List<Trigger> addCoreTriggers() {
// On startup of the application after crash recovery, invoke workflow
// schedule trigger
- List<Trigger> triggers = getWorkflowScheduleService().triggerWorkflowScheduling();
- return triggers;
+ return getWorkflowScheduleService().triggerWorkflowScheduling();
}
public void setSchedulerBean(final SchedulerFactoryBean schedulerBean) {