If the node attribute of the Disco#info reponse is null, set it to the node value of the request.

1 files changed, 18 insertions, 3 deletions

diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/caps/EntityCapsManager.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/caps/EntityCapsManager.java
index 9204515..aab2c61 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/caps/EntityCapsManager.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/caps/EntityCapsManager.java
@@ -997,13 +997,28 @@ public class EntityCapsManager
          */
         public boolean isValid(DiscoverInfo discoverInfo)
         {
-            return
-                (discoverInfo != null)
+            if(discoverInfo != null)
+            {
+                // The "node" attribute is not necessary in the query element.
+                // For example, Swift does not send back the "node" attribute in
+                // the Disco#info response. Thus, if the node of the IQ response
+                // is null, then we set it to the request one.
+                if(discoverInfo.getNode() == null)
+                {
+                    discoverInfo.setNode(getNodeVer());
+                }
+
+                if(getNodeVer().equals(discoverInfo.getNode())
                     && !hash.equals("")
                     && ver.equals(
                             capsToHash(
                                 hash,
-                                calculateEntityCapsString(discoverInfo)));
+                                calculateEntityCapsString(discoverInfo))))
+                {
+                    return true;
+                }
+            }
+            return false;
         }
     }
 }