svn commit: r806338 - in /mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery: handler/DiscoInfoIQHandler.java handler/DiscoItemIQHandler.java management/InfoRequest.java

[ngn]

Author: ngn
Date: Thu Aug 20 20:20:56 2009
New Revision: 806338

URL: http://svn.apache.org/viewvc?rev=806338&view=rev
Log:
Add the original disco request ID to the InfoRequest.

Modified:
    
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
    
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
    
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoRequest.java

Modified: 
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
URL: 
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java?rev=806338&r1=806337&r2=806338&view=diff
==============================================================================
--- 
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
 (original)
+++ 
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
 Thu Aug 20 20:20:56 2009
@@ -114,9 +114,9 @@
         List<InfoElement> elements = null;
         try {
             if (isServerInfoRequest) {
-                elements = serviceCollector.processServerInfoRequest(new 
InfoRequest(stanza.getFrom(), to, node));
+                elements = serviceCollector.processServerInfoRequest(new 
InfoRequest(stanza.getFrom(), to, node, stanza.getID()));
             } else {
-                elements = serviceCollector.processInfoRequest(new 
InfoRequest(stanza.getFrom(), to, node));
+                elements = serviceCollector.processInfoRequest(new 
InfoRequest(stanza.getFrom(), to, node, stanza.getID()));
             }
         } catch (ServiceDiscoveryRequestException e) {
             // the request yields an error

Modified: 
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
URL: 
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java?rev=806338&r1=806337&r2=806338&view=diff
==============================================================================
--- 
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
 (original)
+++ 
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoItemIQHandler.java
 Thu Aug 20 20:20:56 2009
@@ -103,7 +103,7 @@
         // collect all the item response elements
         List<Item> items = null;
         try {
-            items = serviceCollector.processItemRequest(new 
InfoRequest(stanza.getFrom(), stanza.getTo(), node));
+            items = serviceCollector.processItemRequest(new 
InfoRequest(stanza.getFrom(), stanza.getTo(), node, stanza.getID()));
         } catch (ServiceDiscoveryRequestException e) {
             // the request yields an error
             StanzaErrorCondition stanzaErrorCondition = e.getErrorCondition();

Modified: 
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoRequest.java
URL: 
http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoRequest.java?rev=806338&r1=806337&r2=806338&view=diff
==============================================================================
--- 
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoRequest.java
 (original)
+++ 
mina/sandbox/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/management/InfoRequest.java
 Thu Aug 20 20:20:56 2009
@@ -30,11 +30,13 @@
     private Entity from;
     private Entity to;
     private String node = null;
+    private String id;
 
-    public InfoRequest(Entity from, Entity to, String node) {
+    public InfoRequest(Entity from, Entity to, String node, String id) {
         this.from = from;
         this.to = to;
         this.node = node;
+        this.id = id;
     }
 
     public Entity getFrom() {
@@ -48,4 +50,11 @@
     public String getNode() {
         return node;
     }
+    
+    /**
+     * The ID of the original request
+     */
+    public String getID() {
+        return id;
+    }
 }