From 84bc0537b30faac7179e2d7969ac188a9195ea0f Mon Sep 17 00:00:00 2001
From: Felix Sidokhine <felix.sidokhine@randstad.ca>
Date: Wed, 13 May 2020 00:58:46 +0300
Subject: [PATCH] Added early returns to avoid exceptions
---
.../net/jami/jams/ad/connector/service/UserProfileService.java | 1 +
.../net/jami/jams/ldap/connector/service/UserProfileService.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/ad-connector/src/main/java/net/jami/jams/ad/connector/service/UserProfileService.java b/ad-connector/src/main/java/net/jami/jams/ad/connector/service/UserProfileService.java
index ee7e1ba9..60861426 100644
--- a/ad-connector/src/main/java/net/jami/jams/ad/connector/service/UserProfileService.java
+++ b/ad-connector/src/main/java/net/jami/jams/ad/connector/service/UserProfileService.java
@@ -42,6 +42,7 @@ public class UserProfileService {
}
List<List<Field>> results = queryResponse.getAll().stream().map(EntityResponse::getValue).collect(Collectors.toList());
if(results.size() > 0) profiles = new UserProfile[results.size()];
+ else return null;
for(int i=0;i< profiles.length; i++){
profiles[i] = profileFromResponse(results.get(i));
}
diff --git a/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java b/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java
index fd881025..474c89c7 100644
--- a/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java
+++ b/ldap-connector/src/main/java/net/jami/jams/ldap/connector/service/UserProfileService.java
@@ -31,6 +31,7 @@ public class UserProfileService {
SearchOperation search = new SearchOperation(connectionFactory);
SearchResponse res = search.execute(buildRequest(queryString,field));
if (res.getEntries().size() > 0) profiles = new UserProfile[res.getEntries().size()];
+ else return null;
Iterator<LdapEntry> iterator = res.getEntries().iterator();
int i = 0;
while(iterator.hasNext()){
--
GitLab