aboutsummaryrefslogtreecommitdiffstats
path: root/vespajlib
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2020-12-03 15:29:31 +0100
committerJon Marius Venstad <venstad@gmail.com>2020-12-03 15:29:31 +0100
commit81a447ba3229ddb675cf446af1c84f3ae541d2bd (patch)
tree24f24dfcedf280bb2643dfe5ebdf7a184d657726 /vespajlib
parenta30f94af8019b0316d893fcc45b7f84df6ba068d (diff)
Report reindexing progress as -1 for non-current states
Diffstat (limited to 'vespajlib')
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/LocalInstance.java6
-rw-r--r--vespajlib/src/main/java/com/yahoo/concurrent/ThreadLocalDirectory.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/LocalInstance.java b/vespajlib/src/main/java/com/yahoo/concurrent/LocalInstance.java
index 1e929f3ee36..1f886c6f34a 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/LocalInstance.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/LocalInstance.java
@@ -10,12 +10,12 @@ import com.yahoo.concurrent.ThreadLocalDirectory.Updater;
* {@link ThreadLocal} in ThreadLocalDirectory if possible, but has no user
* available methods.
*
- * @param AGGREGATOR
+ * @param <AGGREGATOR>
* the structure to insert produced data into
- * @param SAMPLE
+ * @param <SAMPLE>
* type of produced data to insert from each participating thread
*
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
*/
public final class LocalInstance<AGGREGATOR, SAMPLE> {
/**
diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadLocalDirectory.java b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadLocalDirectory.java
index 5ab1c88775a..016ad167e98 100644
--- a/vespajlib/src/main/java/com/yahoo/concurrent/ThreadLocalDirectory.java
+++ b/vespajlib/src/main/java/com/yahoo/concurrent/ThreadLocalDirectory.java
@@ -95,7 +95,7 @@ public final class ThreadLocalDirectory<AGGREGATOR, SAMPLE> {
* This might be an empty list, creating a new counter set to zero, or
* even copying the current state of LocalInstance.current.
* LocalInstance.current will be set to the value received from this
- * factory after invokation this method.
+ * factory after invocation this method.
*
* <p>
* The first time this method is invoked for a thread, previous will be
@@ -223,7 +223,7 @@ public final class ThreadLocalDirectory<AGGREGATOR, SAMPLE> {
// Has to set registered before adding to the list. Otherwise, the
// instance might be removed from the list, set as unregistered, and
// then the local thread might happily remove that information. The Java
- // memory model is a guarantuee for the minimum amount of visibility,
+ // memory model is a guarantee for the minimum amount of visibility,
// not a definition of the actual amount.
q.setRegistered(true);
synchronized (directoryLock) {