OF-1042: Don't NPE when a session is already closed when processing </stream>.

683d49d1 · Guus der Kinderen · 88a4deeb · 683d49d1
Commit 683d49d1 authored Jan 12, 2016 by Guus der Kinderen
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

StanzaHandler.java src/java/org/jivesoftware/openfire/net/StanzaHandler.java +3 -1

No files found.
--- a/src/java/org/jivesoftware/openfire/net/StanzaHandler.java
+++ b/src/java/org/jivesoftware/openfire/net/StanzaHandler.java
@@ -150,7 +150,9 @@ public abstract class StanzaHandler {

        // Verify if end of stream was requested
        if (stanza.equals("</stream:stream>")) {
-            session.close();
+            if (session != null) {
+                session.close();
+            }
            return;
        }
        // Ignore <?xml version="1.0"?> stanzas sent by clients