Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Avoid NoSuchElementException if the connection stalls.

Browse Source
This commit is contained in:
akwizgran
2011-10-28 13:13:05 +01:00
parent 0728f76933
commit 40689b7e6e
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
test/net/sf/briar/plugins/bluetooth/BluetoothTest.java
View File

@@ -19,12 +19,16 @@ abstract class BluetoothTest {
out.println(CHALLENGE); out.println(CHALLENGE);
System.out.println("Sent challenge: " + CHALLENGE); System.out.println("Sent challenge: " + CHALLENGE);
Scanner in = new Scanner(s.getInputStream()); Scanner in = new Scanner(s.getInputStream());
String response = in.nextLine(); if(in.hasNextLine()) {
System.out.println("Received response: " + response); String response = in.nextLine();
if(BluetoothClientTest.RESPONSE.equals(response)) { System.out.println("Received response: " + response);
System.out.println("Correct response"); if(BluetoothClientTest.RESPONSE.equals(response)) {
System.out.println("Correct response");
} else {
System.out.println("Incorrect response");
}
} else { } else {
System.out.println("Incorrect response"); System.out.println("No response");
} }
s.dispose(true); s.dispose(true);
} catch(IOException e) { } catch(IOException e) {
@@ -36,14 +40,18 @@ abstract class BluetoothTest {
void receiveChallengeAndSendResponse(StreamTransportConnection s) { void receiveChallengeAndSendResponse(StreamTransportConnection s) {
try { try {
Scanner in = new Scanner(s.getInputStream()); Scanner in = new Scanner(s.getInputStream());
String challenge = in.nextLine(); if(in.hasNextLine()) {
System.out.println("Received challenge: " + challenge); String challenge = in.nextLine();
if(BluetoothServerTest.CHALLENGE.equals(challenge)) { System.out.println("Received challenge: " + challenge);
PrintStream out = new PrintStream(s.getOutputStream()); if(BluetoothServerTest.CHALLENGE.equals(challenge)) {
out.println(RESPONSE); PrintStream out = new PrintStream(s.getOutputStream());
System.out.println("Sent response: " + RESPONSE); out.println(RESPONSE);
System.out.println("Sent response: " + RESPONSE);
} else {
System.out.println("Incorrect challenge");
}
} else { } else {
System.out.println("Incorrect challenge"); System.out.println("No challenge");
} }
s.dispose(true); s.dispose(true);
} catch(IOException e) { } catch(IOException e) {