You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/10/01 18:08:33 UTC
[32/38] guacamole-client git commit: GUACAMOLE-220: Remove
unnecessary use of multi-result select (use selectOne() instead).
GUACAMOLE-220: Remove unnecessary use of multi-result select (use selectOne() instead).
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/5fdd0bb1
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/5fdd0bb1
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/5fdd0bb1
Branch: refs/heads/master
Commit: 5fdd0bb14820954c2b39f991d4445b9e783149e2
Parents: a552d88
Author: Michael Jumper <mj...@apache.org>
Authored: Thu Sep 27 20:07:24 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Thu Sep 27 20:07:24 2018 -0700
----------------------------------------------------------------------
.../apache/guacamole/auth/jdbc/usergroup/UserGroupService.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/5fdd0bb1/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/src/main/java/org/apache/guacamole/auth/jdbc/usergroup/UserGroupService.java
----------------------------------------------------------------------
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 0f4a216..3c42572 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<ModeledUserG
throw new GuacamoleClientException("The group name must not be blank.");
// Do not create duplicate user groups
- Collection<UserGroupModel> 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