Merge pull request #18 from glyptodon/fix-null-string

GUAC-933: Do not set parent identifier to the string "null".
This commit is contained in:
James Muehlner committed 2014-12-09 20:54:41 -08:00
commit f3e08e7a71
2 files changed
+14 -2

No files matched your search

@@ -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);
}
/**
@@ -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);
}
/**