X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-os%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fservice%2FUserServiceImpl.java;h=b5ccfc028ad56a8e296520a558cbe0a9cf3f38cc;hb=aa9b320ff93511280cf51b03d38fb9254af6b530;hp=34515705faa2fc562dc0e37a637ec9b212775126;hpb=fe3a67c11b65d7989a6ef648c3f34eee8abe7394;p=portal.git

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
index 34515705..b5ccfc02 100644
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
+++ b/ecomp-portal-BE-os/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
@@ -128,7 +128,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 2 failed", e);
@@ -185,8 +187,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 object
 				for (int i = 0; i < jsonUsers.length(); i++) {
@@ -220,8 +223,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 2 failed", e);
 				}