Merge pull request #17816 from ghalliday/issue30358

HPCC-30358 Avoid converting local hostname to a blank string Reviewed-by: Jake Smith <[email protected]> Merged-by: Gavin Halliday <[email protected]>
hpcc-systems · Sep 26, 2023 · 2b038c1 · 2b038c1
2 parents 65b9811 + 7df93fd
commit 2b038c1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/system/jlib/jsocket.cpp b/system/jlib/jsocket.cpp
@@ -3598,7 +3598,6 @@ bool IpAddress::ipset(const char *text)
 {
     if (text&&*text) {
         if ((text[0]=='.')&&(text[1]==0)) {
-            hostname.set(GetCachedHostName()); // Is this better than '.'?
             ipset(queryHostIP());
             return true;
         }

diff --git a/system/jlib/jstring.cpp b/system/jlib/jstring.cpp
@@ -1434,7 +1434,7 @@ StringAttr& StringAttr::operator = (StringAttr && from)
 
 StringAttr& StringAttr::operator = (const StringAttr & from)
 {
-    set(from.str());
+    set(from.get());
     return *this;
 }