You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2010/05/05 17:32:55 UTC
svn commit: r941347 - in
/mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler:
MUCMessageHandler.java MUCPresenceHandler.java
Author: ngn
Date: Wed May 5 15:32:55 2010
New Revision: 941347
URL: http://svn.apache.org/viewvc?rev=941347&view=rev
Log:
Relax the verification of stanzas sent for MUC
Modified:
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java
mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.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/handler/MUCMessageHandler.java?rev=941347&r1=941346&r2=941347&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java Wed May 5 15:32:55 2010
@@ -72,7 +72,8 @@ public class MUCMessageHandler extends D
@Override
protected boolean verifyNamespace(Stanza stanza) {
- return MUCHandlerHelper.verifyNamespace(stanza);
+ // accept all messages sent to this module
+ return true;
}
private Stanza createMessageErrorStanza(Entity from, Entity to, String id, StanzaErrorType type,
Modified: mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.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/handler/MUCPresenceHandler.java?rev=941347&r1=941346&r2=941347&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java (original)
+++ mina/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java Wed May 5 15:32:55 2010
@@ -72,7 +72,8 @@ public class MUCPresenceHandler extends
@Override
protected boolean verifyNamespace(Stanza stanza) {
- return MUCHandlerHelper.verifyNamespace(stanza);
+ // accept all messages sent to this module
+ return true;
}
private Stanza createPresenceErrorStanza(Entity from, Entity to, String id, String type, String errorName) {
@@ -99,7 +100,7 @@ public class MUCPresenceHandler extends
}
String type = stanza.getType();
-
+ System.out.println("11111" + stanza);
if(type == null) {
return available(stanza, roomJid, occupantJid, nick, serverRuntimeContext);
} else if(type.equals("unavailable")) {
@@ -128,7 +129,7 @@ public class MUCPresenceHandler extends
// TODO what to use for the room name?
Room room = conference.findOrCreateRoom(roomJid, roomJid.getNode());
-
+ System.out.println(room);
if(room.isInRoom(newOccupantJid)) {
// user is already in room, change nick