Algorithm name check before dataset check.

madgik · Nov 16, 2020 · 70e8161 · 70e8161
1 parent 070c0fa
commit 70e8161
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/...master/src/main/java/madgik/exareme/master/gateway/async/handler/HBP/HBPQueryHandler.java b/...master/src/main/java/madgik/exareme/master/gateway/async/handler/HBP/HBPQueryHandler.java
@@ -99,9 +99,14 @@ private void handleHBPAlgorithmExecution(HttpRequest request, HttpResponse respo
             preExecutionChecks(request);
 
             String algorithmName = getAlgorithmName(request);
+            AlgorithmProperties algorithmProperties = Algorithms.getInstance().getAlgorithmProperties(algorithmName);
+            if (algorithmProperties == null)
+                throw new RequestException(algorithmName, "The algorithm '" + algorithmName + "' does not exist.");
+
             String algorithmKey = algorithmName + "_" + System.currentTimeMillis();
-            log.info("Executing algorithm: " + algorithmName + " with key: " + algorithmKey);
 
+            // Logging the algorithm execution parameters
+            log.info("Executing algorithm: " + algorithmName + " with key: " + algorithmKey);
             HashMap<String, String> algorithmParameters = HBPQueryHelper.getAlgorithmParameters(request);
             log.info("Request for algorithm: " + algorithmName);
             if (algorithmParameters != null) {
@@ -113,10 +118,6 @@ private void handleHBPAlgorithmExecution(HttpRequest request, HttpResponse respo
 
             AdpDBClientQueryStatus queryStatus;
 
-            AlgorithmProperties algorithmProperties = Algorithms.getInstance().getAlgorithmProperties(algorithmName);
-            if (algorithmProperties == null)
-                throw new RequestException(algorithmName, "The algorithm '" + algorithmName + "' does not exist.");
-
             algorithmProperties.mergeWithAlgorithmParameters(algorithmParameters);
 
             DataSerialization ds = DataSerialization.summary;