svn commit: r808841 - /mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java

[berndf]

Author: berndf
Date: Fri Aug 28 10:21:57 2009
New Revision: 808841

URL: http://svn.apache.org/viewvc?rev=808841&view=rev
Log:
VYSPER-117: MUC message stanza handling: use server context to relay stanza. 
sending message now works on the MUC part, fails somewhere else.

Modified:
    
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java

Modified: 
mina/sandbox/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/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java?rev=808841&r1=808840&r2=808841&view=diff
==============================================================================
--- 
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java
 (original)
+++ 
mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java
 Fri Aug 28 10:21:57 2009
@@ -81,7 +81,7 @@
             SessionContext sessionContext) {
 
         logger.debug("Received message for MUC");
-        Entity from = sessionContext.getInitiatingEntity();
+        Entity from = stanza.getFrom();
         Entity roomWithNickJid = stanza.getTo();
         Entity roomJid = roomWithNickJid.getBareJID();
 
@@ -115,7 +115,7 @@
                             
                             relayStanza(occupent.getJid(), 
                                     StanzaBuilder.createClone(stanza, true, 
replaceAttributes).getFinalStanza(),
-                                    sessionContext);
+                                    serverRuntimeContext);
                         }
                     } else {
                         return createMessageErrorStanza(room.getJID(), from, 
stanza.getID(), StanzaErrorType.MODIFY, StanzaErrorCondition.FORBIDDEN, stanza);
@@ -148,7 +148,7 @@
                     
                         relayStanza(receivingOccupant.getJid(), 
                             StanzaBuilder.createClone(stanza, true, 
replaceAttributes).getFinalStanza(),
-                            sessionContext);
+                            serverRuntimeContext);
                     } else {
                         // TODO correct error?
                         return createMessageErrorStanza(moduleDomain, from, 
stanza.getID(), StanzaErrorType.MODIFY, StanzaErrorCondition.ITEM_NOT_FOUND, 
stanza);
@@ -165,9 +165,9 @@
     }
 
     protected void relayStanza(Entity receiver, Stanza stanza,
-            SessionContext sessionContext) {
+            ServerRuntimeContext serverRuntimeContext) {
         try {
-            sessionContext.getServerRuntimeContext().getStanzaRelay().relay(
+            serverRuntimeContext.getStanzaRelay().relay(
                     receiver, stanza, new IgnoreFailureStrategy());
         } catch (DeliveryException e) {
             logger.warn("presence relaying failed ", e);