From 1e0f75f4c8b83069b139d7751c7c8360229da804 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 9 Dec 2014 20:53:06 -0800 Subject: [PATCH] GUAC-933: Do not set parent identifier to the string "null". --- .../guacamole/net/auth/mysql/MySQLConnection.java | 8 +++++++- .../guacamole/net/auth/mysql/MySQLConnectionGroup.java | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) 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 66879cf4a..d0b95f073 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 @@ -103,7 +103,13 @@ public class MySQLConnection extends AbstractConnection { */ public void setParentID(Integer parentID) { this.parentID = parentID; - this.setParentIdentifier(String.valueOf(parentID)); + + // Translate to string identifier + if (parentID != null) + this.setParentIdentifier(String.valueOf(parentID)); + else + this.setParentIdentifier(null); + } /** diff --git a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java index aabd40ab3..cc879f818 100644 --- a/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java +++ b/extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnectionGroup.java @@ -124,7 +124,13 @@ public class MySQLConnectionGroup extends AbstractConnectionGroup { */ public void setParentID(Integer parentID) { this.parentID = parentID; - this.setParentIdentifier(String.valueOf(parentID)); + + // Translate to string identifier + if (parentID != null) + this.setParentIdentifier(String.valueOf(parentID)); + else + this.setParentIdentifier(null); + } /**