Changeset 93c6df7

Timestamp:

Jun 21, 2018 6:41:21 PM (3 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

1e24523

Parents:

e33bb2a

Message:

SusiMail?: Fix NPE on logout (ticket #2266)

Files:

• apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java (modified) (1 diff)
• history.txt (modified) (1 diff)
• router/java/src/net/i2p/router/RouterVersion.java (modified) (1 diff)

apps/susimail/src/src/i2p/susi/webmail/pop3/POP3MailBox.java

@@ -1317 +1317 @@
                                 try {
                                         deletePending(!shouldWait);
-                                        if (shouldWait) {
-                                                sendCmd1a("QUIT");
-                                                if (_log.shouldDebug()) _log.debug("close() with wait complete");
-                                        } else {
-                                                sendCmd1aNoWait("QUIT");
+                                        if (socket != null && socket.isConnected()) {
+                                                if (shouldWait) {
+                                                        sendCmd1a("QUIT");
+                                                        if (_log.shouldDebug()) _log.debug("close() with wait complete");
+                                                } else {
+                                                        sendCmd1aNoWait("QUIT");
+                                                }
                                         }
                                 } catch (IOException e) {

history.txt

@@ +1 @@
+2018-06-21 zzz
+ * Console: Add Azerbaijani
+ * SusiMail: Fix NPE on logout (ticket #2266)
+
 2018-06-19 zzz
+ * Console:
+   - Restore line breaks in copy/pasted logs (ticket #2078)
+   - Don't show individual tx/rx graphs if showing combined graph (ticket #2106)
  * SSU: Set volatile on field (ticket #2260)
 

router/java/src/net/i2p/router/RouterVersion.java

@@ -19 +19 @@
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 21;
+    public final static long BUILD = 22;
 
     /** for example "-test" */