Merge pull request #14567 from richardkchapman/HPCC-25283

HPCC-25283 Improve exception report for malformed URL exception

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

roxie/ccd/ccdserver.cpp

@@ -26810,6 +26810,7 @@ public:
             }
             catch (IException *E)
             {
+                E = makeWrappedException(E);
                 ctx->notifyAbort(E);
                 exception.set(E);
                 abort();
@@ -26856,23 +26857,30 @@ public:
         ActivityTimer t(activityStats, timeActivities);
         if(eof) return NULL;
 
-        if (soaphelper == NULL)
+        try
         {
-            if (factory->getKind()==TAKhttp_rowdataset)
-                soaphelper.setown(createHttpCallHelper(this, rowAllocator, authToken.str(), SCrow, pClientCert, *this, this));
-            else
-                soaphelper.setown(createSoapCallHelper(this, rowAllocator, authToken.str(), SCrow, pClientCert, *this, this));
-            soaphelper->start();
-        }
+            if (soaphelper == NULL)
+            {
+                if (factory->getKind()==TAKhttp_rowdataset)
+                    soaphelper.setown(createHttpCallHelper(this, rowAllocator, authToken.str(), SCrow, pClientCert, *this, this));
+                else
+                    soaphelper.setown(createSoapCallHelper(this, rowAllocator, authToken.str(), SCrow, pClientCert, *this, this));
+                soaphelper->start();
+            }
 
-        OwnedConstRoxieRow ret = soaphelper->getRow();
-        if (!ret)
+            OwnedConstRoxieRow ret = soaphelper->getRow();
+            if (!ret)
+            {
+                eof = true;
+                return NULL;
+            }
+            ++processed;
+            return ret.getClear();
+        }
+        catch (IException *E)
         {
-            eof = true;
-            return NULL;
+            throw makeWrappedException(E);
         }
-        ++processed;
-        return ret.getClear();
     }
 };
 
@@ -26991,20 +26999,27 @@ public:
         ActivityTimer t(activityStats, timeActivities);
         if(eof) return NULL;
 
-        if (soaphelper == NULL)
+        try
         {
-            soaphelper.setown(createSoapCallHelper(this, rowAllocator, authToken.str(), SCdataset, pClientCert, *this, this));
-            soaphelper->start();
-        }
+            if (soaphelper == NULL)
+            {
+                soaphelper.setown(createSoapCallHelper(this, rowAllocator, authToken.str(), SCdataset, pClientCert, *this, this));
+                soaphelper->start();
+            }
 
-        OwnedConstRoxieRow ret = soaphelper->getRow();
-        if (!ret)
+            OwnedConstRoxieRow ret = soaphelper->getRow();
+            if (!ret)
+            {
+                eof = true;
+                return NULL;
+            }
+            ++processed;
+            return ret.getClear();
+        }
+        catch (IException *E)
         {
-            eof = true;
-            return NULL;
+            throw makeWrappedException(E);
         }
-        ++processed;
-        return ret.getClear();
     }
 };