Merge pull request #6135 from vespa-engine/bratseth/propagate-internal-redeploy-right

Correct parameter order

3 files changed, 2 insertions, 7 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java
index 76241c560e4..2b6f9e24dd3 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/ConfigSubscription.java
@@ -204,7 +204,7 @@ public abstract class ConfigSubscription<T extends ConfigInstance> {
 
     void setInternalRedeploy(boolean internalRedeploy) {
         ConfigState<T> prev = config.get();
-        this.config.set(new ConfigState<>(prev.isGenerationChanged(), prev.getGeneration(), prev.isConfigChanged(), internalRedeploy, prev.getConfig()));
+        this.config.set(new ConfigState<>(prev.isGenerationChanged(), prev.getGeneration(), internalRedeploy, prev.isConfigChanged(), prev.getConfig()));
     }
 
     /**
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/Benchmark.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/Benchmark.java
index bb2110a0f5f..51a1b09b9fa 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/Benchmark.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/Benchmark.java
@@ -16,7 +16,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 /**
- * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a>
+ * @author Simon Thoresen
  */
 public final class Benchmark {
 
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/StreamEvaluationBenchmark.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/StreamEvaluationBenchmark.java
index 280ffc6278b..760e056327c 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/StreamEvaluationBenchmark.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/StreamEvaluationBenchmark.java
@@ -147,11 +147,6 @@ public class StreamEvaluationBenchmark {
         new StreamEvaluationBenchmark().run();
     }
 
-    private void assertEqualish(double a,double b) {
-        if (Math.abs(a-b) >= Math.abs((a+b)/100000000) )
-            throw new RuntimeException("Expected value " + a + " but optimized evaluation produced " + b);
-    }
-    
     private void bindStreamingFeatures(Map<String, Double> featureItem, Context context) {
         for (Map.Entry<String, Double> feature : featureItem.entrySet())
             context.put(feature.getKey(), feature.getValue());