瀏覽代碼

HPCC-21684 Internal errors from constant-folding Java

Late changes to Java embed code introduced a couple of issues.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 6 年之前
父節點
當前提交
40022c94a6
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      ecl/hql/hqlfold.cpp
  2. 1 1
      plugins/javaembed/javaembed.cpp

+ 1 - 1
ecl/hql/hqlfold.cpp

@@ -1479,7 +1479,7 @@ class DummyContext: implements ICodeContext
     virtual char *getGroupName() { throwUnexpected(); } // caller frees return string.
     virtual char *getJobName() { throwUnexpected(); } // caller frees return string.
     virtual char *getJobOwner() { throwUnexpected(); } // caller frees return string.
-    virtual unsigned getNodeNum() { throwUnexpected(); }
+    virtual unsigned getNodeNum() { return 0; }
     virtual unsigned getNodes() { throwUnexpected(); }
     virtual char *getOS() { throwUnexpected(); } // caller frees return string
     virtual char *getPlatform() { throwUnexpected(); } // caller frees return string.

+ 1 - 1
plugins/javaembed/javaembed.cpp

@@ -3071,7 +3071,7 @@ public:
                 val++;
                 if (stricmp(optName, "classpath")==0)
                     lclassPath.append(';').append(val);
-                if (strieq(optName, "globalscope"))
+                else if (strieq(optName, "globalscope"))
                     globalScopeKey.set(val);
                 else if (strieq(optName, "persist"))
                 {