safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 21:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-220: Remove unnecessary use of multi-result select (use selectOne() instead).

Browse Source
This commit is contained in:
Michael Jumper
2018-09-27 20:07:24 -07:00
parent a552d88c54
commit 5fdd0bb148
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/usergroup/UserGroupService.java
View File

@@ -21,8 +21,6 @@ package org.apache.guacamole.auth.jdbc.usergroup;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider; 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.ModeledDirectoryObjectMapper;
import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectService; import org.apache.guacamole.auth.jdbc.base.ModeledDirectoryObjectService;
import org.apache.guacamole.GuacamoleClientException; import org.apache.guacamole.GuacamoleClientException;
@@ -147,8 +145,8 @@ public class UserGroupService extends ModeledDirectoryObjectService<ModeledUserG
throw new GuacamoleClientException("The group name must not be blank."); throw new GuacamoleClientException("The group name must not be blank.");
// Do not create duplicate user groups // Do not create duplicate user groups
Collection<UserGroupModel> existing = userGroupMapper.select(Collections.singleton(model.getIdentifier())); UserGroupModel existing = userGroupMapper.selectOne(model.getIdentifier());
if (!existing.isEmpty()) if (existing != null)
throw new GuacamoleClientException("Group \"" + model.getIdentifier() + "\" already exists."); throw new GuacamoleClientException("Group \"" + model.getIdentifier() + "\" already exists.");
// Create base entity object, implicitly populating underlying entity ID // Create base entity object, implicitly populating underlying entity ID