Bläddra i källkod

HPCC-9535 Rationalize Roxie topology info

Fix another regression in previous commit (empty aclName should be accepted).

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 12 år sedan
förälder
incheckning
2346ac2b73
2 ändrade filer med 2 tillägg och 2 borttagningar
  1. 1 1
      roxie/ccd/ccdmain.cpp
  2. 1 1
      roxie/udplib/udptrs.cpp

+ 1 - 1
roxie/ccd/ccdmain.cpp

@@ -966,7 +966,7 @@ int STARTQUERY_API start_query(int argc, const char *argv[])
                     roxieServer.setown(createRoxieWorkUnitListener(numThreads, suspended));
 
                 const char *aclName = roxieFarm.queryProp("@aclName");
-                if (aclName)
+                if (aclName && *aclName)
                 {
                     Owned<IPropertyTree> aclInfo = createPTree("AccessInfo");
                     getAccessList(aclName, topology, aclInfo);

+ 1 - 1
roxie/udplib/udptrs.cpp

@@ -1203,7 +1203,7 @@ public:
     virtual IMessagePacker *createMessagePacker(ruid_t ruid, unsigned sequence, const void *messageHeader, unsigned headerSize, unsigned destNodeIndex, int queue)
     {
         if (destNodeIndex >= numNodes)
-            throw MakeStringException(ROXIE_UDP_ERROR, "createMesagePacker: invalid destination node index %i", destNodeIndex);
+            throw MakeStringException(ROXIE_UDP_ERROR, "createMessagePacker: invalid destination node index %i", destNodeIndex);
         return new CMessagePacker(ruid, sequence, messageHeader, headerSize, *this, destNodeIndex, myNodeIndex, getNextMessageSequence(), queue);
     }