svn commit: r990222 - /mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java

[berndf]

Author: berndf
Date: Fri Aug 27 18:29:31 2010
New Revision: 990222

URL: http://svn.apache.org/viewvc?rev=990222&view=rev
Log:
improve routing stanzas to components

Modified:
    
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java

Modified: 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
URL: 
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java?rev=990222&r1=990221&r2=990222&view=diff
==============================================================================
--- 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
 (original)
+++ 
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/modules/core/base/handler/RelayingIQHandler.java
 Fri Aug 27 18:29:31 2010
@@ -21,6 +21,7 @@ package org.apache.vysper.xmpp.modules.c
 
 import org.apache.vysper.xmpp.addressing.Entity;
 import org.apache.vysper.xmpp.addressing.EntityImpl;
+import org.apache.vysper.xmpp.addressing.EntityUtils;
 import org.apache.vysper.xmpp.delivery.failure.DeliveryException;
 import 
org.apache.vysper.xmpp.delivery.failure.ReturnErrorToSenderFailureStrategy;
 import org.apache.vysper.xmpp.modules.roster.persistence.RosterManager;
@@ -61,7 +62,8 @@ public class RelayingIQHandler extends I
 
         if (outboundStanza) {
             try {
-                boolean toComponent = !to.isNodeSet() && !to.isResourceSet();
+
+                boolean toComponent = 
EntityUtils.isAddressingServerComponent(to, 
serverRuntimeContext.getServerEnitity());
 
                 Entity from = stanza.getFrom();
                 if (from == null || !from.isResourceSet()) {
@@ -94,7 +96,8 @@ public class RelayingIQHandler extends I
             // write inbound stanza to the user
 
             Entity from = stanza.getFrom();
-            boolean fromComponent = (from != null) && (!from.isNodeSet()) && 
(!from.isResourceSet());
+
+            boolean fromComponent = (from != null) && 
EntityUtils.isAddressingServerComponent(from, 
serverRuntimeContext.getServerEnitity());
 
             // determine if 'from' is a component or a matching subscription...
             boolean isToContact = false;