Merge branch 'candidate-5.6.2' into candidate-6.0.0

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

ecl/hqlcpp/hqlhtcpp.cpp

@@ -11291,8 +11291,18 @@ ABoundActivity * HqlCppTranslator::doBuildActivityDictionaryWorkunitWrite(BuildC
     IHqlExpression * name = queryResultName(expr);
     int sequence = (int)getIntValue(seq, ResultSequenceInternal);
 
-    assertex(dictionary->getOperator() == no_createdictionary);
-    IHqlExpression * dataset = dictionary->queryChild(0);
+    OwnedHqlExpr dataset;
+    switch (dictionary->getOperator())
+    {
+    case no_null:
+        dataset.setown(createNullDataset(dictionary));
+        break;
+    case no_createdictionary:
+        dataset.set(dictionary->queryChild(0));
+        break;
+    default:
+        throwUnexpectedOp(dictionary->getOperator());
+    }
 
     Owned<ABoundActivity> boundDataset = buildCachedActivity(ctx, dataset);
 

ecl/regress/issue14507.ecl

@@ -0,0 +1,9 @@
+RCCodes(STRING5 Code) := MODULE
+EXPORT Dct := DICTIONARY([
+        ],{ STRING5 Code => STRING GroupType, STRING Description }) : ONCE;
+EXPORT GroupType := Dct[Code].GroupType;
+EXPORT Description := Dct[Code].Description;
+END;
+
+Description := RCCodes('23456').Description;
+output (Description);

esp/src/eclwatch/HPCCPlatformWidget.js

@@ -200,7 +200,7 @@ define([
             this.activity.watch("Build", function (name, oldValue, newValue) {
                 context.build = WsSMC.parseBuildString(newValue);
             });
-            this.activity.watch("changedCount", function (name, oldValue, newValue) {
+            this.activity.watch("__hpcc_changedCount", function (name, oldValue, newValue) {
                 context.refreshBanner(context.activity);
             });