Fix the variable name and check null in finally

zsxwing · zsxwing · commit 9570bec0d545 · 2015-08-04T20:25:42.000+08:00
diff --git a/external/mqtt/src/test/scala/org/apache/spark/streaming/mqtt/MQTTStreamSuite.scala b/external/mqtt/src/test/scala/org/apache/spark/streaming/mqtt/MQTTStreamSuite.scala
@@ -35,28 +35,28 @@ class MQTTStreamSuite extends SparkFunSuite with Eventually with BeforeAndAfter
   private val topic = "def"
 
   private var ssc: StreamingContext = _
-  private var MQTTTestUtils: MQTTTestUtils = _
+  private var mqttTestUtils: MQTTTestUtils = _
 
   before {
     ssc = new StreamingContext(master, framework, batchDuration)
-    MQTTTestUtils = new MQTTTestUtils
-    MQTTTestUtils.setup()
+    mqttTestUtils = new MQTTTestUtils
+    mqttTestUtils.setup()
   }
 
   after {
     if (ssc != null) {
       ssc.stop()
       ssc = null
     }
-    if (MQTTTestUtils != null) {
-      MQTTTestUtils.teardown()
-      MQTTTestUtils = null
+    if (mqttTestUtils != null) {
+      mqttTestUtils.teardown()
+      mqttTestUtils = null
     }
   }
 
   test("mqtt input stream") {
     val sendMessage = "MQTT demo for spark streaming"
-    val receiveStream = MQTTUtils.createStream(ssc, "tcp://" + MQTTTestUtils.brokerUri, topic,
+    val receiveStream = MQTTUtils.createStream(ssc, "tcp://" + mqttTestUtils.brokerUri, topic,
       StorageLevel.MEMORY_ONLY)
 
     @volatile var receiveMessage: List[String] = List()
@@ -71,7 +71,7 @@ class MQTTStreamSuite extends SparkFunSuite with Eventually with BeforeAndAfter
 
     // Retry it because we don't know when the receiver will start.
     eventually(timeout(10000 milliseconds), interval(100 milliseconds)) {
-      MQTTTestUtils.publishData(topic, sendMessage)
+      mqttTestUtils.publishData(topic, sendMessage)
       assert(sendMessage.equals(receiveMessage(0)))
     }
     ssc.stop()
diff --git a/external/mqtt/src/test/scala/org/apache/spark/streaming/mqtt/MQTTTestUtils.scala b/external/mqtt/src/test/scala/org/apache/spark/streaming/mqtt/MQTTTestUtils.scala
@@ -100,9 +100,11 @@ private class MQTTTestUtils extends Logging {
         }
       }
     } finally {
-      client.disconnect()
-      client.close()
-      client = null
+      if (client != null) {
+        client.disconnect()
+        client.close()
+        client = null
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,11 @@ private class MQTTTestUtils extends Logging {`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`} finally {`
`103`		`- client.disconnect()`
`104`		`- client.close()`
`105`		`- client = null`
	`103`	`+ if (client != null) {`
	`104`	`+ client.disconnect()`
	`105`	`+ client.close()`
	`106`	`+ client = null`
	`107`	`+ }`
`106`	`108`	`}`
`107`	`109`	`}`
`108`	`110`