From: rb7147 <rb7147@att.com>
Date: Fri, 19 Jan 2018 15:10:18 +0000 (-0500)
Subject: Resolved the Critical issue reported by Sonar
X-Git-Tag: v1.2.0~181
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=7a2924a2209bce7b0c578b67fd2310d12ccdb1f7

Resolved the Critical issue reported by Sonar

Issue-ID: POLICY-521
Change-Id: I2a7072076a1ed0924bfeacd6f3d2b6a910f30338
Signed-off-by: rb7147 <rb7147@att.com>
---

diff --git a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index 7db760a93..ccc469166 100644
--- a/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/ONAP-SDK-APP/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -27,7 +27,9 @@ import org.onap.portalapp.scheduler.RegistryAdapter;
 import org.onap.portalsdk.core.auth.LoginStrategy;
 import org.onap.portalsdk.core.conf.AppConfig;
 import org.onap.portalsdk.core.conf.Configurable;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.objectcache.AbstractCacheManager;
+import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.onap.portalsdk.core.service.DataAccessService;
 import org.onap.portalsdk.core.util.CacheManager;
 import org.onap.portalsdk.core.util.SystemProperties;
@@ -59,6 +61,8 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 @EnableScheduling
 public class ExternalAppConfig extends AppConfig implements Configurable {
 
+	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ExternalAppConfig.class);
+	
 	private RegistryAdapter schedulerRegistryAdapter;
 
 	@Configuration
@@ -139,11 +143,16 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
 	 */
 	// @Bean // ANNOTATION COMMENTED OUT
 	// APPLICATIONS REQUIRING QUARTZ SHOULD RESTORE ANNOTATION
-	public SchedulerFactoryBean schedulerFactoryBean() throws Exception {
+	public SchedulerFactoryBean schedulerFactoryBean(){
 		SchedulerFactoryBean scheduler = new SchedulerFactoryBean();
 		scheduler.setTriggers(schedulerRegistryAdapter.getTriggers());
 		scheduler.setConfigLocation(appApplicationContext.getResource("WEB-INF/conf/quartz.properties"));
-		scheduler.setDataSource(dataSource());
+		try {
+			scheduler.setDataSource(dataSource());
+		} catch (Exception e) {
+			logger.error("Exception occured While Setting DataSource for schedulerfactorybean"+e);
+			return null;
+		}
 		return scheduler;
 	}