diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-18 23:25:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-18 23:25:01 +0200 |
| commit | f20cdeb2c1e4268cf27930d3a1f8a03201c76356 (patch) | |
| tree | 5663d29d51b8cbcc5b217307f5c07a8a9fcb960c /container-core | |
| parent | b6a52c8fda45d7d3f45a8606b419b5f4becfbaed (diff) | |
| parent | dc9669ff0b7ea4d22c71c03ca63645ff73bffcc5 (diff) | |
Merge pull request #10697 from vespa-engine/revert-10693-revert-10692-revert-10691-revert-10690-balder/no-more-fs4-dispatching-from-fastsearcher
Revert "Revert "Revert "Revert "Balder/no more fs4 dispatching from fastsearcher"""".
Diffstat (limited to 'container-core')
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/handler/VipStatus.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java index 6f827041ffb..b9ef1627ce7 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java +++ b/container-core/src/main/java/com/yahoo/container/handler/VipStatus.java @@ -117,7 +117,9 @@ public class VipStatus { /** Returns whether this container should receive traffic at this time */ public boolean isInRotation() { - return currentlyInRotation; + synchronized (mutex) { + return currentlyInRotation; + } } } |