Merge "Bug: 482928 - MQTT connection not closed if WebSocket closed by server Closing the pipedOutputStream if an exception is thrown. Signed-off-by: James Sutton <james.sutton@uk.ibm.com>" into develop

Author: Ian Craggs

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketReceiver.java

@@ -69,6 +69,7 @@ public void stop() {
 			if(running) {
 				running = false;
 				receiving = false;
+				closeOutputStream();
 				if( !Thread.currentThread().equals(receiverThread)) {
 					try {
 						// Wait for the thread to finish
@@ -100,12 +101,20 @@ public void run() {
 				receiving = false;
 
 			} catch (IOException ex) {
-				
+				// Exception occurred whilst reading the stream. 
+				closeOutputStream();
 			}
 		}
 
 	}
 
+	private void closeOutputStream(){
+		try {
+			pipedOutputStream.close();
+		} catch (IOException e) {
+		}
+	}
+	
 
 	public boolean isRunning() {
 		return running;