summaryrefslogtreecommitdiffstats
path: root/vespajlib
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2023-03-02 21:14:40 +0100
committerJon Bratseth <bratseth@gmail.com>2023-03-02 21:14:40 +0100
commit464a1ec34d9bb04872e799980378bc6e904c48c9 (patch)
tree579e663b3243fd866218b4d10862db8aba5ad672 /vespajlib
parent3a55a18eeac23e95a456e09084c96a5fa3a374a2 (diff)
Define application_generation in containermetrics and add to the vespa set
Diffstat (limited to 'vespajlib')
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/ThreadLocalDirectory.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadLocalDirectory.java b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadLocalDirectory.java
index 15ba65310ff..c28884696aa 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadLocalDirectory.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadLocalDirectory.java
@@ -241,8 +241,7 @@ public final class ThreadLocalDirectory<AGGREGATOR, SAMPLE> {
synchronized (directoryLock) {
previousIntervalSize = directory.size();
previous = directory;
- directory = new ArrayList<>(
- previousIntervalSize);
+ directory = new ArrayList<>(previousIntervalSize);
}
contained = new ArrayList<>(previousIntervalSize);
// Yes, this is an inconsistence about when the registered state is
@@ -268,12 +267,10 @@ public final class ThreadLocalDirectory<AGGREGATOR, SAMPLE> {
throw new IllegalStateException("Does not use observable updaters.");
}
List<LocalInstance<AGGREGATOR, SAMPLE>> current;
- List<AGGREGATOR> view;
synchronized (directoryLock) {
- current = new ArrayList<>(
- directory);
+ current = new ArrayList<>(directory);
}
- view = new ArrayList<>(current.size());
+ List<AGGREGATOR> view = new ArrayList<>(current.size());
for (LocalInstance<AGGREGATOR, SAMPLE> x : current) {
view.add(x.copyCurrent(observableUpdater));
}