Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-26 00:02:06 +01:00
Code Issues Releases Wiki Activity

Wait for Socks5TestProxy initialization

Browse source 
to prevent

org.jivesoftware.smackx.bytestreams.socks5.Socks5ClientForInitiatorTest
  > shouldSuccessfullyEstablishConnectionAndActivateSocks5Proxy
    FAILED
    java.lang.NullPointerException at Socks5ClientForInitiatorTest.java:292
This commit is contained in:
Florian Schmaus 2014-08-16 08:51:13 +02:00
parent 52673bad3c
commit fe9606adb2
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5TestProxy.java
View file

@ -55,6 +55,8 @@ public class Socks5TestProxy {
/* port of the test proxy */ /* port of the test proxy */
private int port = 7777; private int port = 7777;
private boolean startupComplete;
/** /**
* Private constructor. * Private constructor.
*/ */
@ -169,6 +171,19 @@ public class Socks5TestProxy {
* @return socket or null if there is no socket for the given digest * @return socket or null if there is no socket for the given digest
*/ */
public Socket getSocket(String digest) { public Socket getSocket(String digest) {
synchronized(this) {
if (!startupComplete) {
try {
wait(5000);
} catch (InterruptedException e) {
e.printStackTrace();
} finally {
if (!startupComplete) {
throw new IllegalStateException("Startup of Socks5TestProxy failed within 5 seconds");
}
}
}
}
return this.connectionMap.get(digest); return this.connectionMap.get(digest);
} }
@ -205,6 +220,10 @@ public class Socks5TestProxy {
// initialize connection // initialize connection
establishConnection(socket); establishConnection(socket);
synchronized (this) {
startupComplete = true;
notify();
}
} }
catch (SocketException e) { catch (SocketException e) {
/* do nothing */ /* do nothing */