svn commit: r806339 - in /mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src: main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/ test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/

[ngn]

Author: ngn
Date: Thu Aug 20 20:22:23 2009
New Revision: 806339

URL: http://svn.apache.org/viewvc?rev=806339&view=rev
Log:
Make use of the ID from the original request when forwarding disco requests 
(VSYPER-106)

Modified:
    
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
    
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java

Modified: 
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
URL: 
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java?rev=806339&r1=806338&r2=806339&view=diff
==============================================================================
--- 
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
 (original)
+++ 
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
 Thu Aug 20 20:22:23 2009
@@ -184,7 +184,7 @@
     
     private void relayDiscoStanza(Entity receiver, InfoRequest request, String 
ns) {
         // TODO how to get id?
-        StanzaBuilder builder = 
StanzaBuilder.createIQStanza(request.getFrom(), receiver, IQStanzaType.GET, 
"1");
+        StanzaBuilder builder = 
StanzaBuilder.createIQStanza(request.getFrom(), receiver, IQStanzaType.GET, 
request.getID());
         builder.startInnerElement("query", ns);
         if(request.getNode() != null) {
             builder.addAttribute("node", request.getNode());

Modified: 
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
URL: 
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java?rev=806339&r1=806338&r2=806339&view=diff
==============================================================================
--- 
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
 (original)
+++ 
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
 Thu Aug 20 20:22:23 2009
@@ -32,8 +32,6 @@
         }
     }
     
-    
-    
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -55,7 +53,7 @@
         room.addOccupant(OCCUPANT1_JID, "nick");
         room.addOccupant(OCCUPANT2_JID, "Nick 2");
 
-        StanzaBuilder request = StanzaBuilder.createIQStanza(OCCUPANT1_JID, 
new EntityImpl(ROOM1_JID, "Nick 2"), IQStanzaType.GET, "1");
+        StanzaBuilder request = StanzaBuilder.createIQStanza(OCCUPANT1_JID, 
new EntityImpl(ROOM1_JID, "Nick 2"), IQStanzaType.GET, "123");
         request.startInnerElement("query", getNamespace()).endInnerElement();
 
         // send message to room
@@ -67,6 +65,7 @@
         assertEquals(OCCUPANT1_JID, stanza.getFrom());
         assertEquals(OCCUPANT2_JID, stanza.getTo());
         assertEquals("get", stanza.getAttributeValue("type"));
+        assertEquals("123", stanza.getAttributeValue("id"));
         XMLElement query = stanza.getFirstInnerElement();
         assertNotNull(query);
         assertEquals(getNamespace(), query.getNamespaceURI());