From ee3f817bbd568677cbb2b298dda6444163bc59b8 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Mon, 23 Feb 2015 15:54:20 -0800
Subject: [PATCH] GUAC-1101: Properly translate to/from NULL parent using the
 root identifier.

---
 .../net/auth/mysql/MySQLConnection.java          | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java
index 177517805..57a2a5fc9 100644
--- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java
+++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java
@@ -105,12 +105,26 @@ public class MySQLConnection implements Connection, DirectoryObject<ConnectionMo
 
     @Override
     public String getParentIdentifier() {
-        return connectionModel.getParentIdentifier();
+
+        // Translate null parent to proper identifier
+        String parentIdentifier = connectionModel.getParentIdentifier();
+        if (parentIdentifier == null)
+            return MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER;
+
+        return parentIdentifier;
+        
     }
 
     @Override
     public void setParentIdentifier(String parentIdentifier) {
+
+        // Translate root identifier back into null
+        if (parentIdentifier != null
+                && parentIdentifier.equals(MySQLConstants.CONNECTION_GROUP_ROOT_IDENTIFIER))
+            parentIdentifier = null;
+
         connectionModel.setParentID(parentIdentifier);
+
     }
 
     @Override