Browse Source

Some checking in checkUserOnChannel. Probably fixes issue 3473.

Change-Id: I8e580edc2e37d60524673bab073914bb4f0f3a1f
Reviewed-on: http://gerrit.dmdirc.com/437
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
tags/0.6.3
Shane Mc Cormack 14 years ago
parent
commit
d37edafd86

+ 2
- 0
src/com/dmdirc/addons/parser_twitter/Debug.java View File

@@ -36,6 +36,8 @@ enum Debug {
36 36
     dataIn,
37 37
     /** Debug information for data output. */
38 38
     dataOut,
39
+    /** Error with internal state. */
40
+    stateError,
39 41
     /** General error info from the twitter parser. */
40 42
     twitterError,
41 43
     /** More debuggy error info from the twitter parser. */

+ 5
- 0
src/com/dmdirc/addons/parser_twitter/Twitter.java View File

@@ -817,6 +817,11 @@ public class Twitter implements Parser, TwitterErrorHandler, TwitterRawHandler,
817 817
     private boolean checkUserOnChannel(final TwitterUser user) {
818 818
         final TwitterChannelInfo channel = (TwitterChannelInfo) this.getChannel(mainChannelName);
819 819
 
820
+	if (channel == null) {
821
+		doDebug(Debug.stateError, "Tried to check user (" + user.getScreenName() + "), but channel is null.");
822
+		return false;
823
+	}
824
+
820 825
         if (channel.getChannelClient(user.getScreenName()) == null) {
821 826
             final TwitterClientInfo ci = new TwitterClientInfo(user.getScreenName(), this);
822 827
             clients.put(ci.getNickname().toLowerCase(), ci);

Loading…
Cancel
Save