Fix NPE in abort()

stellaraccident · stellaraccident · commit 44d0ed93378e · 2011-04-27T14:52:15.000-07:00
diff --git a/src/net/rcode/wsclient/WebSocket.java b/src/net/rcode/wsclient/WebSocket.java
@@ -310,15 +310,15 @@ public void abort() {
 		
 		if (localReaderThread!=null) {
 			try {
-				readerThread.join();
+				localReaderThread.join();
 			} catch (InterruptedException e) {
 				Thread.currentThread().interrupt();
 			}
 		}
 		
 		if (localWriterThread!=null) {
 			try {
-				writerThread.join();
+				localWriterThread.join();
 			} catch (InterruptedException e) {
 				Thread.currentThread().interrupt();
 			}

Original file line number	Diff line number	Diff line change
`@@ -310,15 +310,15 @@ public void abort() {`
`310`	`310`
`311`	`311`	`if (localReaderThread!=null) {`
`312`	`312`	`try {`
`313`		`- readerThread.join();`
	`313`	`+ localReaderThread.join();`
`314`	`314`	`} catch (InterruptedException e) {`
`315`	`315`	`Thread.currentThread().interrupt();`
`316`	`316`	`}`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`if (localWriterThread!=null) {`
`320`	`320`	`try {`
`321`		`- writerThread.join();`
	`321`	`+ localWriterThread.join();`
`322`	`322`	`} catch (InterruptedException e) {`
`323`	`323`	`Thread.currentThread().interrupt();`
`324`	`324`	`}`