/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *   http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 *
 */

package org.apache.jmeter.timers;

import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterThread;

/**
 * Manages logic related to timers and pauses
 * @since 3.2
 */
public class TimerService {
    
    private TimerService() {
        super();
    }
    
    /**
     * Initialization On Demand Holder pattern
     */
    private static class TimerServiceHolder {
        public static final TimerService INSTANCE = new TimerService();
    }
 
    /**
     * @return ScriptEngineManager singleton
     */
    public static TimerService getInstance() {
        return TimerServiceHolder.INSTANCE;
    }
    
    /**
     * Adjust delay so that initialDelay does not exceed end of test
     * @param delay initial delay in millis
     * @return initialDelay or adjusted delay
     */
    public long adjustDelay(final long initialDelay) {
        JMeterThread thread = JMeterContextService.getContext().getThread();
        long endTime = thread != null ? thread.getEndTime() : 0;
        return adjustDelay(initialDelay, endTime);
    }

    /**
     * Adjust delay so that initialDelay does not exceed end of test
     * @param initialDelay initial delay in millis
     * @param endTime End time of JMeterThread
     * @return initialDelay or adjusted delay
     */
    public long adjustDelay(final long initialDelay, long endTime) {
        if (endTime > 0) {
            long now = System.currentTimeMillis();
            if(now + initialDelay > endTime) {
                return endTime - now;
            }
        }
        return initialDelay;
    }
}

@@ -1536,17 +1536,24 @@
  @param 
-d
+initialD
 elay ini

Fix javadocs