From 0d676940257091a1ad60af931fcb491ea4bdd4ba Mon Sep 17 00:00:00 2001
From: Arina Ielchiieva <arina.yelchiyeva@gmail.com>
Date: Wed, 9 Nov 2016 13:08:18 +0200
Subject: [PATCH] DRILL-5007: Dynamic UDF lazy-init does not work correctly in
 multi-node cluster

---
 .../drill/exec/expr/fn/FunctionImplementationRegistry.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionImplementationRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionImplementationRegistry.java
index ede255aa606..988a9f6b418 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionImplementationRegistry.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionImplementationRegistry.java
@@ -157,7 +157,7 @@ private DrillFuncHolder findDrillFunction(FunctionResolver functionResolver, Fun
     if (holder == null && retry) {
       if (optionManager != null && optionManager.getOption(ExecConstants.DYNAMIC_UDF_SUPPORT_ENABLED).bool_val) {
         if (loadRemoteFunctions(version.get())) {
-          findDrillFunction(functionResolver, functionCall, false);
+          return findDrillFunction(functionResolver, functionCall, false);
         }
       }
     }
@@ -200,7 +200,7 @@ private DrillFuncHolder findExactMatchingDrillFunction(String name, List<MajorTy
 
     if (retry && optionManager != null && optionManager.getOption(ExecConstants.DYNAMIC_UDF_SUPPORT_ENABLED).bool_val) {
       if (loadRemoteFunctions(version.get())) {
-        findExactMatchingDrillFunction(name, argTypes, returnType, false);
+        return findExactMatchingDrillFunction(name, argTypes, returnType, false);
       }
     }
     return null;