[email protected] wrote: > Author: ngn > Date: Sat Aug 28 08:53:33 2010 > New Revision: 990326 > > URL: http://svn.apache.org/viewvc?rev=990326&view=rev > Log: > Some additional refactorings based on EntityUtils (VYSPER-246) > > Added: > > mina/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/addressing/EntityUtilsTestCase.java > 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=990326&r1=990325&r2=990326&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 08:53:33 2010 > @@ -76,11 +76,9 @@ public class StanzaRelayBroker implement > //return; > } > > - String domain = receiver.getDomain(); > - > boolean relayToExternal = > serverRuntimeContext.getServerFeatures().isRelayingToFederationServers(); > > - if > (domain.endsWith(serverRuntimeContext.getServerEnitity().getDomain())) { > + if (EntityUtils.isAddressingServerComponent(receiver, > serverRuntimeContext.getServerEnitity()) || toComponent) { > internalRelay.relay(receiver, stanza, deliveryFailureStrategy); > } else { > if (!relayToExternal)
I don't think the last change is equivalent. domain.endsWith(serverRuntimeContext.getServerEnitity().getDomain() is true for domain values of "chat.vysper.org" and "vysper.org" while EntityUtils.isAddressingServerComponent(receiver, ...getDomain()) is true for "chat.vysper.org" but false for "vysper.org" I didn't change this line in the first place, but should have commmented it instead. I'm +1 to revert, WDYT? Bernd
