Author: ngn
Date: Sat Aug 28 13:40:25 2010
New Revision: 990362
URL: http://svn.apache.org/viewvc?rev=990362&view=rev
Log:
Fixing bug introduce with the latest changes, realying to components now work
(VYSPER-246)
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
Modified:
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java?rev=990362&r1=990361&r2=990362&view=diff
==============================================================================
---
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
(original)
+++
mina/vysper/trunk/server/core/src/main/java/org/apache/vysper/xmpp/delivery/StanzaRelayBroker.java
Sat Aug 28 13:40:25 2010
@@ -64,7 +64,8 @@ public class StanzaRelayBroker implement
boolean toServerTLD = receiver == null
|| (!receiver.isNodeSet() &&
EntityUtils.isAddressingServer(receiver,
serverRuntimeContext.getServerEnitity()));
- boolean toComponent = !toServerTLD && !receiver.isNodeSet();
+
+ boolean toComponent =
EntityUtils.isAddressingServerComponent(receiver,
serverRuntimeContext.getServerEnitity());
if (toServerTLD) {
// TODO handle by server
@@ -78,7 +79,7 @@ public class StanzaRelayBroker implement
boolean relayToExternal =
serverRuntimeContext.getServerFeatures().isRelayingToFederationServers();
- if (EntityUtils.isAddressingServerComponent(receiver,
serverRuntimeContext.getServerEnitity()) || toComponent) {
+ if (EntityUtils.isAddressingServer(receiver,
serverRuntimeContext.getServerEnitity()) || toComponent) {
internalRelay.relay(receiver, stanza, deliveryFailureStrategy);
} else {
if (!relayToExternal)