From 5fdd0bb14820954c2b39f991d4445b9e783149e2 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 27 Sep 2018 20:07:24 -0700 Subject: [PATCH] GUACAMOLE-220: Remove unnecessary use of multi-result select (use selectOne() instead). --- .../guacamole/auth/jdbc/usergroup/UserGroupService.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/usergroup/UserGroupService.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/usergroup/UserGroupService.java index 0f4a21683..3c42572ce 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/usergroup/UserGroupService.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/usergroup/UserGroupService.java @@ -21,8 +21,6 @@ package org.apache.guacamole.auth.jdbc.usergroup; import com.google.inject.Inject; import com.google.inject.Provider; -import java.util.Collection; -import java.util.Collections; import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectMapper; import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectService; import org.apache.guacamole.GuacamoleClientException; @@ -147,8 +145,8 @@ public class UserGroupService extends ModeledDirectoryObjectService existing = userGroupMapper.select(Collections.singleton(model.getIdentifier())); - if (!existing.isEmpty()) + UserGroupModel existing = userGroupMapper.selectOne(model.getIdentifier()); + if (existing != null) throw new GuacamoleClientException("Group \"" + model.getIdentifier() + "\" already exists."); // Create base entity object, implicitly populating underlying entity ID