Tweak to make sure error message gets through. Better eval xquery

Author: aebadirad

marklogic-data-hub/src/main/java/com/marklogic/hub/impl/DataHubImpl.java

@@ -545,7 +545,7 @@ private Map<Integer, String> getServerPortsInUse() {
                 updatedFlows.addAll(flows);
             }
 
-            runInDatabase("for $i in cts:uris(\"\", (), cts:and-not-query(cts:collection-query(\"hub-core-module\"), cts:document-query((\"/com.marklogic.hub/config.sjs\", \"/com.marklogic.hub/config.xqy\")))) return xdmp:document-delete($i)", hubConfig.getDbName(DatabaseKind.MODULES));
+            runInDatabase("cts:uris(\"\", (), cts:and-not-query(cts:collection-query(\"hub-core-module\"), cts:document-query((\"/com.marklogic.hub/config.sjs\", \"/com.marklogic.hub/config.xqy\")))) ! xdmp:document-delete(.)", hubConfig.getDbName(DatabaseKind.MODULES));
 
             if (isHubInstalled) {
                 // install hub modules into MarkLogic

quick-start/src/main/java/com/marklogic/quickstart/web/CurrentProjectController.java

@@ -211,7 +211,7 @@ public ResponseEntity<?> updateHub() throws IOException, CantUpgradeException {
                 return new ResponseEntity<>(HttpStatus.NO_CONTENT);
             }
         } catch (CantUpgradeException e) {
-            return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST);
+            return new ResponseEntity<>(e, HttpStatus.BAD_REQUEST);
         }
         return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
     }