1 files changed, 33 insertions, 16 deletions

diff --git a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/TimeoutHandler.java b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/TimeoutHandler.java
index 53258c06..d7945c53 100644
--- a/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/TimeoutHandler.java
+++ b/ecomp-portal-BE-common/src/main/java/org/openecomp/portalapp/service/sessionmgt/TimeoutHandler.java
@@ -1,21 +1,39 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the “License”);
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.openecomp.portalapp.service.sessionmgt;
 
@@ -59,9 +77,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 @EnableAspectJAutoProxy
 @EPMetricsLog
 public class TimeoutHandler extends QuartzJobBean {
-	EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(TimeoutHandler.class);
+	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(TimeoutHandler.class);
 	
-	ObjectMapper mapper = new ObjectMapper();
+	private ObjectMapper mapper = new ObjectMapper();
 
 	/**
 	 * Supports static call {@link #timeoutSessions(HttpSession)}
@@ -69,7 +87,7 @@ public class TimeoutHandler extends QuartzJobBean {
 	private static List<OnboardingApp> onboardedAppList = null;
 	
 	@Autowired
-	SessionCommunication sessionCommunication;
+	private SessionCommunication sessionCommunication;
 	
 	@Override
 	protected void executeInternal(JobExecutionContext context) throws JobExecutionException {
@@ -179,8 +197,7 @@ public class TimeoutHandler extends QuartzJobBean {
 				try {
 					sessionTimeoutMapStr = mapper.writeValueAsString(sessionTimeoutMap);
 				} catch (JsonProcessingException je) {
-					logger.error(EELFLoggerDelegate.errorLogger, "Exception occurred while processing sessionTimeOutMap object to a String. Details: "
-									+ EcompPortalUtils.getStackTrace(je));
+					logger.error(EELFLoggerDelegate.errorLogger, "executeInternal failed while processing sessionTimeOutMap object to a String", je);
 					EPLogUtil.logEcompError(logger, EPAppMessagesEnum.BeInvalidJsonInput, je);
 				}
 				pingAppSessions(app, sessionTimeoutMapStr);