safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1101: Properly translate to/from NULL parent using the root identifier.

Browse Source
This commit is contained in:
Michael Jumper
2015-02-23 15:54:20 -08:00
parent 0e4507f3d1
commit ee3f817bbd
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/guacamole-auth-mysql/src/main/java/net/sourceforge/guacamole/net/auth/mysql/MySQLConnection.java
View File

@@ -105,12 +105,26 @@ public class MySQLConnection implements Connection, DirectoryObject<ConnectionMo
@Override @Override
public String getParentIdentifier() { 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 @Override
public void setParentIdentifier(String parentIdentifier) { 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); connectionModel.setParentID(parentIdentifier);
} }
@Override @Override