Merge branch 'candidate-6.4.26'

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>

esp/src/eclwatch/TargetSelectClass.js

@@ -308,11 +308,13 @@ define([
                     if (lang.exists("TpDropZoneQueryResponse.TpDropZones.TpDropZone", response)) {
                         var targetData = response.TpDropZoneQueryResponse.TpDropZones.TpDropZone;
                         for (var i = 0; i < targetData.length; ++i) {
-                            context.options.push({
-                                label: targetData[i].Name,
-                                value: targetData[i].Name,
-                                machine: targetData[i].TpMachines.TpMachine[0]
-                            });
+                            if (lang.exists("TpMachines.TpMachine", targetData[i])) {
+                                context.options.push({
+                                    label: targetData[i].Name,
+                                    value: targetData[i].Name,
+                                    machine: targetData[i].TpMachines.TpMachine[0]
+                                });
+                            }
                         }
                         context._postLoad();
                     }
@@ -630,4 +632,4 @@ define([
                 });
             }
         };
-    });
+    });

roxie/ccd/ccdlistener.cpp

@@ -174,7 +174,7 @@ public:
         lockQuery.appendf("<control:childlock thisEndpoint='%d' parent='%d'/>", activeIdxes.item(idx), myEndpoint);
         doChildQuery(idx, lockQuery.str(), lockReply);
         Owned<IPropertyTree> lockResult = createPTreeFromXMLString(lockReply.str(), ipt_caseInsensitive|ipt_fast);
-        int lockCount = lockResult->getPropInt("Lock", 0);
+        int lockCount = lockResult ? lockResult->getPropInt("Lock", 0) : 0;
         if (lockCount)
         {
             return lockCount;