Fix NPE on dijkstra() and astar() functions

Resolves: #7818
orientechnologies · Oct 30, 2017 · f523d42 · f523d42
1 parent b8011ac
commit f523d42
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...rc/main/java/com/orientechnologies/orient/core/sql/functions/graph/OSQLFunctionAstar.java b/...rc/main/java/com/orientechnologies/orient/core/sql/functions/graph/OSQLFunctionAstar.java
@@ -116,6 +116,9 @@ public LinkedList<OVertex> execute(final Object iThis, final OIdentifiable iCurr
       bindAdditionalParams(iParams[3], context);
     }
     iContext.setVariable("getNeighbors", 0);
+    if (paramSourceVertex == null || paramDestinationVertex == null) {
+      return new LinkedList<>();
+    }
     return internalExecute(iContext, iContext.getDatabase());
 
   }
@@ -243,8 +246,8 @@ private void bindAdditionalParams(Object additionalParams, OSQLFunctionAstar ctx
       ctx.paramDFactor = doubleOrDefault(mapParams.get(OSQLFunctionAstar.PARAM_D_FACTOR), ctx.paramDFactor);
       if (mapParams.get(OSQLFunctionAstar.PARAM_HEURISTIC_FORMULA) != null) {
         if (mapParams.get(OSQLFunctionAstar.PARAM_HEURISTIC_FORMULA) instanceof String) {
-          ctx.paramHeuristicFormula = HeuristicFormula
-              .valueOf(stringOrDefault(mapParams.get(OSQLFunctionAstar.PARAM_HEURISTIC_FORMULA), "MANHATAN").toUpperCase(Locale.ENGLISH));
+          ctx.paramHeuristicFormula = HeuristicFormula.valueOf(
+              stringOrDefault(mapParams.get(OSQLFunctionAstar.PARAM_HEURISTIC_FORMULA), "MANHATAN").toUpperCase(Locale.ENGLISH));
         } else {
           ctx.paramHeuristicFormula = (HeuristicFormula) mapParams.get(OSQLFunctionAstar.PARAM_HEURISTIC_FORMULA);
         }

diff --git a/...hdb/src/main/java/com/orientechnologies/orient/graph/sql/functions/OSQLFunctionAstar.java b/...hdb/src/main/java/com/orientechnologies/orient/graph/sql/functions/OSQLFunctionAstar.java
@@ -100,6 +100,9 @@ public LinkedList<OrientVertex> execute(final Object iThis, final OIdentifiable
               bindAdditionalParams(iParams[3], context);
             }
             iContext.setVariable("getNeighbors", 0);
+            if (paramSourceVertex == null || paramDestinationVertex == null) {
+              return new LinkedList<>();
+            }
             return internalExecute(iContext, graph);
           }
         });