Merge pull request #3062 from richardkchapman/roxie-httpcall-gh2956

gh-2956 Roxie support for HTTPCALL activity

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

roxie/ccd/ccdquery.cpp

@@ -424,6 +424,7 @@ protected:
         case TAKskiplimit:
         case TAKcreaterowlimit:
             return createRoxieServerSkipLimitActivityFactory(id, subgraphId, *this, helperFactory, kind);
+        case TAKhttp_rowdataset:
         case TAKsoap_rowdataset:
             return createRoxieServerSoapRowCallActivityFactory(id, subgraphId, *this, helperFactory, kind);
         case TAKsoap_rowaction:

roxie/ccd/ccdserver.cpp

@@ -24486,7 +24486,10 @@ public:
 
         if (soaphelper == NULL)
         {
-            soaphelper.setown(createSoapCallHelper(this, rowAllocator, authToken.str(), SCrow, pClientCert, *ctx, this));
+            if (factory->getKind()==TAKhttp_rowdataset)
+                soaphelper.setown(createHttpCallHelper(this, rowAllocator, authToken.str(), SCrow, pClientCert, *ctx, this));
+            else
+                soaphelper.setown(createSoapCallHelper(this, rowAllocator, authToken.str(), SCrow, pClientCert, *ctx, this));
             soaphelper->start();
         }