s/InterruptedException/InterruptedIOException/

(human)
This commit is contained in:
human
2004-04-20 15:43:04 +00:00
committed by zzz
parent 8038e1ee7d
commit 90350786e6
7 changed files with 9 additions and 19 deletions

View File

@@ -52,7 +52,6 @@ public class I2PTunnelClient extends I2PTunnelClientBase {
} catch (Exception ex) {
_log.info("Error connecting", ex);
l.log(ex.getMessage());
// s has been initialized before the try block...
closeSocket(s);
}
}

View File

@@ -4,6 +4,7 @@
package net.i2p.i2ptunnel;
import java.io.IOException;
import java.io.InterruptedIOException;
import java.net.ConnectException;
import java.net.InetAddress;
import java.net.NoRouteToHostException;
@@ -157,7 +158,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
* @param dest The destination to connect to
* @return a new I2PSocket
*/
public I2PSocket createI2PSocket(Destination dest) throws I2PException, ConnectException, NoRouteToHostException, InterruptedException {
public I2PSocket createI2PSocket(Destination dest) throws I2PException, ConnectException, NoRouteToHostException, InterruptedIOException {
return createI2PSocket(dest, getDefaultOptions());
}
@@ -172,10 +173,10 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
*
* @throws ConnectException if the peer refuses the connection
* @throws NoRouteToHostException if the peer is not found or not reachable
* @throws InterruptedException if the connection timeouts
* @throws InterruptedIOException if the connection timeouts
* @throws I2PException if there is some other I2P-related problem
*/
public I2PSocket createI2PSocket(Destination dest, I2PSocketOptions opt) throws I2PException, ConnectException, NoRouteToHostException, InterruptedException {
public I2PSocket createI2PSocket(Destination dest, I2PSocketOptions opt) throws I2PException, ConnectException, NoRouteToHostException, InterruptedIOException {
I2PSocket i2ps;
synchronized (sockLock) {

View File

@@ -201,12 +201,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
l.log(ex.getMessage());
handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, wwwProxy);
closeSocket(s);
} catch (InterruptedException ex) {
if (timeoutThread != null) timeoutThread.disable();
_log.info("Error trying to connect", ex);
l.log(ex.getMessage());
handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, wwwProxy);
closeSocket(s);
} catch (I2PException ex) {
if (timeoutThread != null) timeoutThread.disable();
_log.info("Error trying to connect", ex);

View File

@@ -96,9 +96,6 @@ public abstract class SOCKSServer {
} catch (IOException e) {
throw new SOCKSException("Error connecting ("
+ e.getMessage() + ")");
} catch (InterruptedException e) {
throw new SOCKSException("Error connecting ("
+ e.getMessage() + ")");
} catch (I2PException e) {
throw new SOCKSException("Error connecting ("
+ e.getMessage() + ")");