diff options
8 files changed, 12 insertions, 14 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java index befbda28ac0..f92d218390f 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java +++ b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadpoolImpl.java @@ -54,7 +54,7 @@ public class ContainerThreadpoolImpl extends AbstractComponent implements AutoCl createQueue(queueSize), ThreadFactoryFactory.getThreadFactory(name), threadPoolMetric); - // Prestart needed, if not all threads will be created by the fist N tasks and hence they might also + // Pre-start needed, if not all threads will be created by the fist N tasks and hence they might also // get the dreaded thread locals initialized even if they will never run. // That counters what we want to achieve with the Q that will prefer thread locality. executor.prestartAllCoreThreads(); diff --git a/container-core/src/main/java/com/yahoo/container/handler/threadpool/WorkerCompletionTimingThreadPoolExecutor.java b/container-core/src/main/java/com/yahoo/container/handler/threadpool/WorkerCompletionTimingThreadPoolExecutor.java index e3c2c78abec..cee2cc54b5b 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/threadpool/WorkerCompletionTimingThreadPoolExecutor.java +++ b/container-core/src/main/java/com/yahoo/container/handler/threadpool/WorkerCompletionTimingThreadPoolExecutor.java @@ -8,8 +8,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; /** - * A thread pool executor which maintains the last time a worker completed - * package private for testing + * A thread pool executor which maintains the last time a worker completed. * * @author Steinar Knutsen * @author baldersheim diff --git a/container-core/src/main/java/com/yahoo/container/protect/ProcessTerminator.java b/container-core/src/main/java/com/yahoo/container/protect/ProcessTerminator.java index 315dc21ec38..3c44ba2eaa6 100644 --- a/container-core/src/main/java/com/yahoo/container/protect/ProcessTerminator.java +++ b/container-core/src/main/java/com/yahoo/container/protect/ProcessTerminator.java @@ -4,8 +4,8 @@ package com.yahoo.container.protect; import com.yahoo.protect.Process; /** - * An injectable terminator of the Java vm. - * Components that encounters conditions where the vm should be terminated should + * An injectable terminator of the Java VM. + * Components that encounter conditions where the VM should be terminated should * request an instance of this injected. That makes termination testable * as tests can create subclasses of this which register the termination request * rather than terminating. diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java index 1cc549ec6ca..c16234b3948 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java @@ -75,8 +75,7 @@ public class DeploymentTester { tester = controllerTester; jobs = tester.controller().jobController(); cloud = (MockTesterCloud) tester.controller().jobController().cloud(); - runner = new JobRunner(tester.controller(), maintenanceInterval, JobRunnerTest.inThreadExecutor(), - new InternalStepRunner(tester.controller())); + runner = new JobRunner(tester.controller(), maintenanceInterval, JobRunnerTest.inThreadExecutor(), new InternalStepRunner(tester.controller())); upgrader = new Upgrader(tester.controller(), maintenanceInterval); upgrader.setUpgradesPerMinute(1); // Anything that makes it at least one for any maintenance period is fine. readyJobsTrigger = new ReadyJobsTrigger(tester.controller(), maintenanceInterval); diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/AdaptiveLoadBalancer.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/AdaptiveLoadBalancer.java index 4a4cf0fd5c8..ae934857e2c 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/AdaptiveLoadBalancer.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/AdaptiveLoadBalancer.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Random; /** - * Will pick 2 random candidates and select the one with least pending operations. + * Will pick 2 random candidates and select the one with the least pending operations. * * @author baldersheim */ diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java index ddd04a3ca53..4f8227b35a0 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/LocalServicePolicy.java @@ -23,7 +23,7 @@ public class LocalServicePolicy implements DocumentProtocolRoutingPolicy { private final Map<String, CacheEntry> cache = new HashMap<>(); /** - * Constructs a policy that will choose local services that match the slobrok pattern in which this policy occured. + * Constructs a policy that will choose local services that match the slobrok pattern in which this policy occurred. * If no local service can be found, this policy simply returns the asterisk to allow the network to choose any. * * @param param The address to use for this, if empty this will resolve to hostname. diff --git a/messagebus/src/main/java/com/yahoo/messagebus/ErrorCode.java b/messagebus/src/main/java/com/yahoo/messagebus/ErrorCode.java index 8fab523d4ae..88e3e1a89bc 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/ErrorCode.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/ErrorCode.java @@ -20,7 +20,7 @@ public final class ErrorCode { /** No addresses found for the services of the message route. */ public static final int NO_ADDRESS_FOR_SERVICE = TRANSIENT_ERROR + 2; - /** A connection problem occured while sending. */ + /** A connection problem occurred while sending. */ public static final int CONNECTION_ERROR = TRANSIENT_ERROR + 3; /** The session specified for the message is unknown. */ @@ -50,10 +50,10 @@ public final class ErrorCode { /** No services found for the message route. */ public static final int NO_SERVICES_FOR_ROUTE = FATAL_ERROR + 3; - /** An error occured while encoding the message. */ + /** An error occurred while encoding the message. */ public static final int ENCODE_ERROR = FATAL_ERROR + 5; - /** A fatal network error occured while sending. */ + /** A fatal network error occurred while sending. */ public static final int NETWORK_ERROR = FATAL_ERROR + 6; /** The protocol specified for the message is unknown. */ @@ -77,7 +77,7 @@ public final class ErrorCode { /** Exception thrown by routing policy. */ public static final int POLICY_ERROR = FATAL_ERROR + 13; - /** An error occured while sequencing a message. */ + /** An error occurred while sequencing a message. */ public static final int SEQUENCE_ERROR = FATAL_ERROR + 14; /** An application specific non-recoverable error. */ diff --git a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingContext.java b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingContext.java index 227dd546ad8..18b5de34bb4 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingContext.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/routing/RoutingContext.java @@ -19,7 +19,7 @@ public class RoutingContext { private final RoutingNode node; private final int directive; - private final Set<Integer> consumableErrors = new HashSet<Integer>(); + private final Set<Integer> consumableErrors = new HashSet<>(); private boolean selectOnRetry = true; private Object context = null; |