Merge pull request Twitter4J#199 from miketempleman/master

TFJ-875 Protect from npe when invoking shutdown on site stream
madhavcoder · Jun 2, 2015 · fb51685 · fb51685
2 parents c919c88 + 0338781
commit fb51685
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/twitter4j-stream/src/main/java/twitter4j/StreamController.java b/twitter4j-stream/src/main/java/twitter4j/StreamController.java
@@ -46,7 +46,7 @@ public class StreamController {
     }
 
     void setControlURI(String controlURI) {
-        this.controlURI = controlURI.replace("/1.1//1.1/", "/1.1/");
+        this.controlURI = (controlURI!=null) ?controlURI.replace("/1.1//1.1/", "/1.1/") : null;
         synchronized (lock) {
             lock.notifyAll();
         }