diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2016-06-17 16:09:10 +0200 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2016-06-17 16:09:10 +0200 |
| commit | b5e6d6de45f52311bac17d0677b8a2e6c0d6a8b7 (patch) | |
| tree | a9c3eee97ec634239b3abb0c271d7c936abbb831 | |
| parent | 6713ae38ee570110602ebeb21f58af50a72e9d69 (diff) | |
provide the right classloader
* Make sure we get the classloader that is actually loading
searchlib to find the contained classes.
* Also, no need to forceload the ForceLoad class itself
several extra times.
| -rw-r--r-- | searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java | 7 | ||||
| -rw-r--r-- | searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java index ecbab688821..381e7da994f 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/aggregation/ForceLoad.java @@ -19,7 +19,6 @@ public class ForceLoad { "VdsHit", "Grouping", "Hit", - "ForceLoad", "MinAggregationResult", "GroupingLevel", "MaxAggregationResult", @@ -27,10 +26,10 @@ public class ForceLoad { "AverageAggregationResult", "ExpressionCountAggregationResult", "hll.SparseSketch", - "hll.NormalSketch", - "ForceLoad" + "hll.NormalSketch" }; - com.yahoo.system.ForceLoad.forceLoad(pkg, classes); + com.yahoo.system.ForceLoad.forceLoad(pkg, classes, + ForceLoad.class.getClassLoader()); } public static boolean forceLoad() { diff --git a/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java b/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java index 6ebb4c672c8..8b12f4c5967 100644 --- a/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java +++ b/searchlib/src/main/java/com/yahoo/searchlib/expression/ForceLoad.java @@ -58,7 +58,6 @@ public class ForceLoad { "FloatResultNodeVector", "StringResultNodeVector", "RawResultNodeVector", - "ForceLoad", "MultiplyFunctionNode", "IntegerBucketResultNode", "FloatBucketResultNode", @@ -77,10 +76,10 @@ public class ForceLoad { "ZCurveFunctionNode", "XorBitFunctionNode", "MultiArgFunctionNode", - "DebugWaitFunctionNode", - "ForceLoad" + "DebugWaitFunctionNode" }; - com.yahoo.system.ForceLoad.forceLoad(pkg, classes); + com.yahoo.system.ForceLoad.forceLoad(pkg, classes, + ForceLoad.class.getClassLoader()); } public static boolean forceLoad() { |