You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by be...@apache.org on 2009/05/19 10:39:43 UTC

svn commit: r776237 - in /mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules: core/im/handler/PresenceHandler.java roster/handler/RosterIQHandler.java

Author: berndf
Date: Tue May 19 08:39:43 2009
New Revision: 776237

URL: http://svn.apache.org/viewvc?rev=776237&view=rev
Log:
[vysper] VYSPER-7 roster manager could no longer be retrieved, must be fetched from storage provider registry now.

Modified:
    mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java
    mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java

Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java?rev=776237&r1=776236&r2=776237&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceHandler.java Tue May 19 08:39:43 2009
@@ -56,7 +56,7 @@
 
         RosterManager rosterManager = null;
         try {
-            rosterManager = (RosterManager)serverRuntimeContext.getServerRuntimeContextService(RosterManager.SERVER_SERVICE_ROSTERMANAGER);
+            rosterManager = (RosterManager)serverRuntimeContext.getStorageProvider(RosterManager.class);
         } catch (Exception e) {
             // System.err.println("failed to retrieve roster manager for session id = " + sessionContext.getSessionId());
             String sessionId = sessionContext == null ? "NO_SESSION" : sessionContext.getSessionId();

Modified: mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java?rev=776237&r1=776236&r2=776237&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java (original)
+++ mina/sandbox/vysper/trunk/src/main/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandler.java Tue May 19 08:39:43 2009
@@ -88,7 +88,7 @@
     protected Stanza handleGet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
 
         ResourceRegistry registry = serverRuntimeContext.getResourceRegistry();
-        RosterManager rosterManager = (RosterManager)serverRuntimeContext.getServerRuntimeContextService(RosterManager.SERVER_SERVICE_ROSTERMANAGER);
+        RosterManager rosterManager = (RosterManager)serverRuntimeContext.getStorageProvider(RosterManager.class);
 
         if (rosterManager == null) {
             return handleCannotRetrieveRoster(stanza, sessionContext);
@@ -126,7 +126,7 @@
     })
     @Override
     protected Stanza handleSet(IQStanza stanza, ServerRuntimeContext serverRuntimeContext, SessionContext sessionContext) {
-        RosterManager rosterManager = (RosterManager)serverRuntimeContext.getServerRuntimeContextService(RosterManager.SERVER_SERVICE_ROSTERMANAGER);
+        RosterManager rosterManager = (RosterManager)serverRuntimeContext.getStorageProvider(RosterManager.class);
 
         if (rosterManager == null) {
             return handleCannotRetrieveRoster(stanza, sessionContext);