You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by be...@apache.org on 2009/03/19 07:20:01 UTC
svn commit: r755847 - in /labs/vysper/src/main/java/org/apache/vysper/xmpp:
modules/servicediscovery/handler/DiscoInfoIQHandler.java
server/XMPPServer.java
Author: berndf
Date: Thu Mar 19 06:20:01 2009
New Revision: 755847
URL: http://svn.apache.org/viewvc?rev=755847&view=rev
Log:
[vysper] LABS-228 fix disco info server request and server-module integration
Modified:
labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
labs/vysper/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java?rev=755847&r1=755846&r2=755847&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/DiscoInfoIQHandler.java Thu Mar 19 06:20:01 2009
@@ -84,7 +84,7 @@
Entity to = stanza.getTo();
boolean isServerInfoRequest = false;
- if (to == null) {
+ if (to == null || to.equals(serverRuntimeContext.getServerEnitity())) {
isServerInfoRequest = true; // this can only be meant to query the server
} else if (!to.isNodeSet()) {
isServerInfoRequest = serverRuntimeContext.getServerEnitity().equals(to);
Modified: labs/vysper/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java
URL: http://svn.apache.org/viewvc/labs/vysper/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java?rev=755847&r1=755846&r2=755847&view=diff
==============================================================================
--- labs/vysper/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java (original)
+++ labs/vysper/src/main/java/org/apache/vysper/xmpp/server/XMPPServer.java Thu Mar 19 06:20:01 2009
@@ -134,7 +134,9 @@
}
public void addModule(Module module) {
- serverRuntimeContext.addModule(module);
+ ArrayList<Module> list = new ArrayList<Module>();
+ list.add(module);
+ serverRuntimeContext.setModules(list);
}
private void addCoreDictionaries(List<NamespaceHandlerDictionary> dictionaries) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org