From 3673f6cd03f7dec965715e4f9032099ebe35ceba Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 4 Jan 2015 21:13:18 -0800 Subject: [PATCH] GUAC-983: Move connections/groups based on parent, not parent of parent. --- .../net/basic/rest/connection/ConnectionRESTService.java | 4 ++-- .../rest/connectiongroup/ConnectionGroupRESTService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java index 203004b7a..ef98e0bd7 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connection/ConnectionRESTService.java @@ -314,8 +314,8 @@ public class ConnectionRESTService { ConnectionGroup updatedParentGroup = retrievalService.retrieveConnectionGroup(userContext, connection.getParentIdentifier()); // Update connection parent, if changed - if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getParentIdentifier())) - || (oldParentIdentifier == null && updatedParentGroup.getParentIdentifier() != null)) + if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getIdentifier())) + || (oldParentIdentifier == null && updatedParentGroup.getIdentifier() != null)) connectionDirectory.move(connectionID, updatedParentGroup.getConnectionDirectory()); } diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java index cb767167a..60d094c78 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/connectiongroup/ConnectionGroupRESTService.java @@ -370,8 +370,8 @@ public class ConnectionGroupRESTService { ConnectionGroup updatedParentGroup = retrievalService.retrieveConnectionGroup(userContext, connectionGroup.getParentIdentifier()); // Update connection group parent, if changed - if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getParentIdentifier())) - || (oldParentIdentifier == null && updatedParentGroup.getParentIdentifier() != null)) + if ( (oldParentIdentifier != null && !oldParentIdentifier.equals(updatedParentGroup.getIdentifier())) + || (oldParentIdentifier == null && updatedParentGroup.getIdentifier() != null)) connectionGroupDirectory.move(connectionGroupID, updatedParentGroup.getConnectionGroupDirectory()); }