Merge pull request #49 from dwd/dwd/jabber-s2s-quickfix

Quick fix for old-skool Jabber on S2S

Merge pull request #49 from dwd/dwd/jabber-s2s-quickfix
Quick fix for old-skool Jabber on S2S
8738dcbd · Dele Olajide · a60eefe2 · fcc55409 · 8738dcbd
Commit 8738dcbd authored Jun 24, 2014 by Dele Olajide
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

ServerDialback.java ...java/org/jivesoftware/openfire/server/ServerDialback.java +2 -1

No files found.
--- a/src/java/org/jivesoftware/openfire/server/ServerDialback.java
+++ b/src/java/org/jivesoftware/openfire/server/ServerDialback.java
@@ -674,7 +674,8 @@ public class ServerDialback {
            for (int eventType = xpp.getEventType(); eventType != XmlPullParser.START_TAG;) {
                eventType = xpp.next();
            }
-            if (xpp.getAttributeValue("", "version").equals("1.0")) {
+            if ((xpp.getAttributeValue("", "version") != null) &&
+                (xpp.getAttributeValue("", "version").equals("1.0"))) {
                Document doc;
                try {
                    doc = reader.parseDocument();