Author: berndf
Date: Tue Apr 27 19:45:54 2010
New Revision: 938620
URL: http://svn.apache.org/viewvc?rev=938620&view=rev
Log:
cosmetics only.
Modified:
mina/vysper/trunk/server/core/src/main/config/spring-config.xml
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
Modified: mina/vysper/trunk/server/core/src/main/config/spring-config.xml
URL:
http://svn.apache.org/viewvc/mina/vysper/trunk/server/core/src/main/config/spring-config.xml?rev=938620&r1=938619&r2=938620&view=diff
==============================================================================
--- mina/vysper/trunk/server/core/src/main/config/spring-config.xml (original)
+++ mina/vysper/trunk/server/core/src/main/config/spring-config.xml Tue Apr 27
19:45:54 2010
@@ -109,7 +109,7 @@
<bean
class="org.apache.vysper.xmpp.modules.extension.xep0092_software_version.SoftwareVersionModule"
/>
<bean
class="org.apache.vysper.xmpp.modules.extension.xep0202_entity_time.EntityTimeModule"
/>
<bean
class="org.apache.vysper.xmpp.modules.extension.xep0054_vcardtemp.VcardTempModule"
/>
- <!-- below some more modules which are available as
separatly-built jars.
+ <!-- below some more modules which are available as
separately-built jars.
make sure they are on the classpath when enabling them -->
<bean
class="org.apache.vysper.xmpp.modules.extension.xep0060_pubsub.PublishSubscribeModule"
/>
<bean
class="org.apache.vysper.xmpp.modules.extension.xep0045_muc.MUCModule" />
Modified:
mina/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/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java?rev=938620&r1=938619&r2=938620&view=diff
==============================================================================
---
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
(original)
+++
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
Tue Apr 27 19:45:54 2010
@@ -140,29 +140,28 @@ public class MUCModule
public List<InfoElement> getComponentInfosFor(InfoRequest request) throws
ServiceDiscoveryRequestException {
- if (fullDomain.getDomain().equals(request.getTo().getDomain())) {
- if (request.getTo().getNode() == null) {
- List<InfoElement> serverInfos =
conference.getServerInfosFor(request);
- return serverInfos;
- } else {
- // might be an items request on a room
- Room room = conference.findRoom(request.getTo().getBareJID());
- if (room != null) {
- if (request.getTo().getResource() != null) {
- // request for an occupant
- Occupant occupant =
room.findOccupantByNick(request.getTo().getResource());
- // request for occupant, relay
- if (occupant != null) {
- relayDiscoStanza(occupant.getJid(), request,
NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO);
- }
- } else {
- return room.getInfosFor(request);
- }
+ if (!fullDomain.getDomain().equals(request.getTo().getDomain()))
return null;
+
+ if (request.getTo().getNode() == null) {
+ List<InfoElement> serverInfos =
conference.getServerInfosFor(request);
+ return serverInfos;
+ } else {
+ // might be an items request on a room
+ Room room = conference.findRoom(request.getTo().getBareJID());
+ if (room == null) return null;
+
+ if (request.getTo().getResource() != null) {
+ // request for an occupant
+ Occupant occupant =
room.findOccupantByNick(request.getTo().getResource());
+ // request for occupant, relay
+ if (occupant != null) {
+ relayDiscoStanza(occupant.getJid(), request,
NamespaceURIs.XEP0030_SERVICE_DISCOVERY_INFO);
}
-
+ return null;
+ } else {
+ return room.getInfosFor(request);
}
}
- return null;
}
@Override
