/**
 * 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.activemq.util;


public class Wait {
    
    public static final long MAX_WAIT_MILLIS = 30*1000;
    
    public interface Condition {
        boolean isSatisified() throws Exception;
    }

    public static boolean waitFor(Condition condition) throws Exception {
        return waitFor(condition, MAX_WAIT_MILLIS);
    }
    
    public static boolean waitFor(final Condition condition, final long duration) throws Exception {
        final long expiry = System.currentTimeMillis() + duration;
        boolean conditionSatisified = condition.isSatisified();
        while (!conditionSatisified && System.currentTimeMillis() < expiry) {
            Thread.sleep(1000);
            conditionSatisified = condition.isSatisified();
        }   
        return conditionSatisified;
    }  
}

@@ -834,16 +834,55 @@
 util;%0A%0A%0A
+import java.util.concurrent.TimeUnit;%0A%0A
 public c
@@ -954,16 +954,65 @@
 0*1000;%0A
+    public static final int SLEEP_MILLIS = 1000;%0A
     %0A   
@@ -1229,21 +1229,17 @@
 ;%0A    %7D%0A
-    
 %0A
+
     publ
@@ -1323,32 +1323,230 @@
 ows Exception %7B%0A
+        return waitFor(condition, MAX_WAIT_MILLIS, SLEEP_MILLIS);%0A    %7D%0A%0A    public static boolean waitFor(final Condition condition, final long duration, final int sleepMillis) throws Exception %7B%0A%0A
         final lo
@@ -1755,24 +1755,46 @@
    T
-hread.sleep(1000
+imeUnit.MILLISECONDS.sleep(sleepMillis
 );%0A 

allow the sleep time to be specified to allow finer grain return from a wait