package org.apache.solr.common.util;

/*
 * 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.
 */

import java.util.concurrent.TimeUnit;

public class RetryUtil {
  public static interface RetryCmd {
    public void execute() throws InterruptedException;
  }
  
  public static void retryOnThrowable(Class clazz, long timeoutms, long intervalms, RetryCmd cmd) throws InterruptedException {
    long timeout = System.nanoTime() + TimeUnit.NANOSECONDS.convert(timeoutms, TimeUnit.MILLISECONDS);
    while (true) {
      try {
        cmd.execute();
      } catch (Throwable t) {
        if (clazz.isInstance(t) && System.nanoTime() < timeout) {
          Thread.sleep(intervalms);
          continue;
        }
        throw t;
      }
      // success
      break;
    }
  }
}

@@ -873,16 +873,117 @@
 eUnit;%0A%0A
+import org.apache.solr.common.SolrException;%0Aimport org.apache.solr.common.SolrException.ErrorCode;%0A%0A
 public c
@@ -1559,17 +1559,60 @@
   throw 
-t
+new SolrException(ErrorCode.SERVER_ERROR, t)
 ;%0A      

Update for Java 6 on 4x