/**
 * 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.qpid.jms.support;

import java.util.concurrent.TimeUnit;

public class Wait {

    public static final long MAX_WAIT_MILLIS = 30 * 1000;
    public static final int SLEEP_MILLIS = 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 {
        return waitFor(condition, duration, SLEEP_MILLIS);
    }

    public static boolean waitFor(final Condition condition, final long duration, final int sleepMillis) throws Exception {

        final long expiry = System.currentTimeMillis() + duration;
        boolean conditionSatisified = condition.isSatisified();
        while (!conditionSatisified && System.currentTimeMillis() < expiry) {
            TimeUnit.MILLISECONDS.sleep(sleepMillis);
            conditionSatisified = condition.isSatisified();
        }
        return conditionSatisified;
    }
}

@@ -977,19 +977,20 @@
 c final 
-int
+long
  SLEEP_M
@@ -997,18 +997,17 @@
 ILLIS = 
-10
+5
 00;%0A%0A   
@@ -1480,19 +1480,20 @@
 , final 
-int
+long
  sleepMi

Clean up, make params consitent type, reduce polling delay.