* ============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
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);
List list = null;
StringBuffer criteria = new StringBuffer();
- if (firstName != null)
+ if (firstName != null && lastName != null)
+ criteria.append(" where first_name = '").append(firstName).append("' and last_name = '")
+ .append(lastName).append("'");
+ else if (firstName != null)
criteria.append(" where first_name = '").append(firstName).append("'");
- if (lastName != null)
+ else if (lastName != null)
criteria.append(" where last_name = '").append(lastName).append("'");
list = getDataAccessService().getList(EPUser.class, criteria.toString(), null, null);
return (list == null || list.size() == 0) ? null : list;
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++) {
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);
}