merge of '1fd43bf251a91d33bb1ea9b06f2b35a40be3b9c9'

and '766a92b57cdf82d3b1d1e3a71ef2a3109e883add'
This commit is contained in:
dg2-new
2014-01-04 17:41:15 +00:00
7 changed files with 51 additions and 15 deletions

View File

@@ -305,8 +305,9 @@ public class I2PSocketManagerFull implements I2PSocketManager {
I2PSocket sock = connect(peer, options);
return new StandardSocket(sock);
} catch (I2PException i2pe) {
// fixme in 1.6 change to cause
throw new IOException(i2pe.toString());
IOException ioe = new IOException("connect fail");
ioe.initCause(i2pe);
throw ioe;
}
}

View File

@@ -44,8 +44,9 @@ class StandardServerSocket extends ServerSocket {
throw new IOException("No socket");
return new StandardSocket(sock);
} catch (I2PException i2pe) {
// fixme in 1.6 change to cause
throw new IOException(i2pe.toString());
IOException ioe = new IOException("accept fail");
ioe.initCause(i2pe);
throw ioe;
}
}