Pārlūkot izejas kodu

Merge pull request #89 from csmith/master

Ensure client modes are non-null.
pull/92/head
Greg Holmes 9 gadus atpakaļ
vecāks
revīzija
775c027a80
1 mainītis faili ar 4 papildinājumiem un 2 dzēšanām
  1. 4
    2
      irc/src/com/dmdirc/parser/irc/IRCClientInfo.java

+ 4
- 2
irc/src/com/dmdirc/parser/irc/IRCClientInfo.java Parādīt failu

@@ -34,6 +34,8 @@ import java.util.LinkedList;
34 34
 import java.util.List;
35 35
 import java.util.Map;
36 36
 
37
+import static com.google.common.base.Preconditions.checkNotNull;
38
+
37 39
 /**
38 40
  * Contains information about known users.
39 41
  *
@@ -50,7 +52,7 @@ public class IRCClientInfo implements LocalClientInfo {
50 52
     /** Known host of client. */
51 53
     private String host = "";
52 54
     /** Known user modes of client. */
53
-    private String modes;
55
+    private String modes = "";
54 56
     /** Known Away Reason of client. */
55 57
     private String awayReason = "";
56 58
     /** Known Account name of client. */
@@ -307,7 +309,7 @@ public class IRCClientInfo implements LocalClientInfo {
307 309
      * @param newMode new string containing boolean channel modes.
308 310
      */
309 311
     public void setUserMode(final String newMode) {
310
-        modes = newMode;
312
+        modes = checkNotNull(newMode);
311 313
     }
312 314
 
313 315
     /**

Notiek ielāde…
Atcelt
Saglabāt