Treat component_manager_id="" as undefined

98f6b70a · Jonathon Duerig · 315fb3c1 · 98f6b70a
Commit 98f6b70a authored Apr 07, 2011 by Jonathon Duerig
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

protogeni/lib/GeniXML.pm.in protogeni/lib/GeniXML.pm.in +13 -4

No files found.
--- a/protogeni/lib/GeniXML.pm.in
+++ b/protogeni/lib/GeniXML.pm.in
@@ -304,8 +304,12 @@ sub SetExpires($$)
 sub GetNodeId($)
 {
    my ($node) = @_;
-    return GetFirstText($node, "component_urn", "component_id",
-			"component_uuid", "uuid");
+    my $result = GetFirstText($node, "component_urn", "component_id",
+			      "component_uuid", "uuid");
+    if ($result eq "") {
+	$result = undef;
+    }
+    return $result;
 }

 sub GetVirtualId($)
@@ -336,8 +340,13 @@ sub GetSliverId($)
 sub GetManagerId($)
 {
    my ($node) = @_;
-    return GetFirstText($node, "component_manager_urn",
-			"component_manager_id", "component_manager_uuid");
+    my $result = GetFirstText($node, "component_manager_urn",
+			      "component_manager_id",
+			      "component_manager_uuid");
+    if ($result eq "") {
+	$result = undef;
+    }
+    return $result;
 }

 sub GetColocate($)