Checking in Ray's update to ServiceWaiter.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2374 6335cc39-0255-0410-8fd6-9bcaacd3b74c

src/java/com/samskivert/util/ServiceWaiter.java

@@ -143,25 +143,23 @@ public class ServiceWaiter<T>
     {
         if (_success == 0) {
             synchronized (this) {
-                while (_success == 0) {
-                    try {
-                        // wait for the response, timing out after a while
-                        if (_timeout == NO_TIMEOUT) {
-                            wait();
+                try {
+                    // wait for the response, timing out after a while
+                    if (_timeout == NO_TIMEOUT) {
+                        wait();
 
-                        } else {
-                            wait(1000L * _timeout);
-                        }
-
-                        // if we get here without some sort of response, then
-                        // we've timed out
-                        if (_success == 0) {
-                            throw new TimeoutException();
-                        }
-
-                    } catch (InterruptedException ie) {
-                        // fall through and wait again
+                    } else {
+                        wait(1000L * _timeout);
                     }
+                    // if we get here without some sort of response, then
+                    // we've timed out
+                    if (_success == 0) {
+                        throw new TimeoutException();
+                    }
+
+                } catch (InterruptedException ie) {
+                    throw (TimeoutException)
+                        new TimeoutException().initCause(ie);
                 }
             }
         }