From 71584fa59f4d1f97daa43bf612a7717f7a7de570 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 24 Dec 2014 22:58:38 -0800 Subject: [PATCH] GUAC-932: null connection group identifier does NOT mean root. This is implementation-dependent. --- .../net/basic/rest/connectiongroup/APIConnectionGroup.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java index 3f166f41c..45ca049e7 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/APIConnectionGroup.java @@ -88,11 +88,7 @@ public class APIConnectionGroup { this.identifier = connectionGroup.getIdentifier(); this.parentIdentifier = connectionGroup.getParentIdentifier(); - - // Use the explicit ROOT group ID - if (this.parentIdentifier == null) - this.parentIdentifier = ROOT_IDENTIFIER; - + this.name = connectionGroup.getName(); this.type = connectionGroup.getType();