X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fservice%2FUserServiceImpl.java;h=0f91f6200b9fbca54e87d1c7e727e33019a6d613;hb=6a1b66d85bc824234d01627b826fdd528869f2ed;hp=860712bbd724744e6319dbfaef9be116c6e235b7;hpb=21a8761f684745bb300e075c7e98ad897ace9eed;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
index 860712bb..0f91f620 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
@@ -33,7 +33,7 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalapp.portal.service;
 
@@ -49,11 +49,9 @@ import org.hibernate.criterion.Criterion;
 import org.hibernate.criterion.Restrictions;
 import org.json.JSONArray;
 import org.json.JSONObject;
-import org.onap.portalapp.portal.service.UserService;
-import org.onap.portalapp.portal.service.UserServiceImpl;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
-import org.onap.portalsdk.core.FusionObject.Utilities;
+import org.onap.portalsdk.core.domain.FusionObject.Utilities;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
 import org.onap.portalsdk.core.service.DataAccessService;
@@ -132,7 +130,9 @@ public class UserServiceImpl implements UserService {
 				logger.error(EELFLoggerDelegate.errorLogger, "getUserByUserId failed", e);
 			} finally {
 				try {
+					if(in!=null) {
 					in.close();
+					}
 					con.disconnect();
 				} catch (IOException e) {
 					logger.error(EELFLoggerDelegate.errorLogger, "getUserByUserId failed to close", e);
@@ -189,8 +189,9 @@ public class UserServiceImpl implements UserService {
 
 				in = new BufferedReader(new InputStreamReader(con.getInputStream(), "UTF-8"));
 				String inputLine;
-				while ((inputLine = in.readLine()) != null)
+				while ((inputLine = in.readLine()) != null) {
 					response.append(inputLine);
+				}
 				JSONObject jObject = new JSONObject(response.toString()); // json
 				JSONArray jsonUsers = jObject.getJSONArray("response"); // get
 																		// data
@@ -226,8 +227,10 @@ public class UserServiceImpl implements UserService {
 				logger.error(EELFLoggerDelegate.errorLogger, "getUserByFirstLastName failed", e);
 			} finally {
 				try {
+					if(in!=null) {
 					in.close();
 					con.disconnect();
+					}
 				} catch (IOException e) {
 					logger.error(EELFLoggerDelegate.errorLogger, "getUserByFirstLastName failed to close", e);
 				}