From ef790a8cb12ea34f1cd1d161578a3e0255ac8d56 Mon Sep 17 00:00:00 2001 From: catbref Date: Wed, 13 May 2020 16:30:28 +0100 Subject: [PATCH] Fix missing groupId 0 entry in output from API call GET /chat/active/{address} --- .../hsqldb/HSQLDBChatRepository.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java b/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java index e8dd2b31..ff81dc14 100644 --- a/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java +++ b/src/main/java/org/qortal/repository/hsqldb/HSQLDBChatRepository.java @@ -130,17 +130,16 @@ public class HSQLDBChatRepository implements ChatRepository { List groupChats = new ArrayList<>(); try (ResultSet resultSet = this.repository.checkedExecute(groupsSql, address)) { - if (resultSet == null) - return groupChats; - - do { - int groupId = resultSet.getInt(1); - String groupName = resultSet.getString(2); - long timestamp = resultSet.getLong(3); - - GroupChat groupChat = new GroupChat(groupId, groupName, timestamp); - groupChats.add(groupChat); - } while (resultSet.next()); + if (resultSet != null) { + do { + int groupId = resultSet.getInt(1); + String groupName = resultSet.getString(2); + long timestamp = resultSet.getLong(3); + + GroupChat groupChat = new GroupChat(groupId, groupName, timestamp); + groupChats.add(groupChat); + } while (resultSet.next()); + } } catch (SQLException e) { throw new DataException("Unable to fetch active group chats from repository", e); }