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 2012/07/10 16:16:41 UTC

svn commit: r1359694 - in /mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124: BoshHandler.java InactivityChecker.java

Author: berndf
Date: Tue Jul 10 14:16:40 2012
New Revision: 1359694

URL: http://svn.apache.org/viewvc?rev=1359694&view=rev
Log:
method to retrieve active sessions, improve InactivityChecker

Modified:
    mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java
    mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/InactivityChecker.java

Modified: mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java?rev=1359694&r1=1359693&r2=1359694&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java (original)
+++ mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/BoshHandler.java Tue Jul 10 14:16:40 2012
@@ -288,4 +288,8 @@ public class BoshHandler {
         return body.build();
 
     }
+
+    public int getActiveSessionsCount() {
+        return sessions.size();
+    }
 }

Modified: mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/InactivityChecker.java
URL: http://svn.apache.org/viewvc/mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/InactivityChecker.java?rev=1359694&r1=1359693&r2=1359694&view=diff
==============================================================================
--- mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/InactivityChecker.java (original)
+++ mina/vysper/trunk/server/extensions/xep0124-xep0206-bosh/src/main/java/org/apache/vysper/xmpp/extension/xep0124/InactivityChecker.java Tue Jul 10 14:16:40 2012
@@ -94,7 +94,6 @@ public class InactivityChecker extends T
      * then the session will be removed from the inactivity checker)
      * @return true if the inactivity checker is watching the session (to detect inactivity), false otherwise
      */
-    @SuppressWarnings({"rawtypes"})
     public boolean updateExpireTime(BoshBackedSessionContext session, Long oldExpireTime, Long newExpireTime) {
         boolean ret = session.isWatchedByInactivityChecker();
         if (oldExpireTime == null && newExpireTime == null) {
@@ -126,12 +125,10 @@ public class InactivityChecker extends T
                 break;
             }
 
-            synchronized (this) {
-                try {
-                    wait(CHECKING_INTERVAL_MILLIS);
-                } catch (InterruptedException e) {
-                    break;
-                }
+            try {
+                wait(CHECKING_INTERVAL_MILLIS);
+            } catch (InterruptedException e) {
+                break;
             }
 
             long nowKey = convertToKey(System.currentTimeMillis());
@@ -153,6 +150,7 @@ public class InactivityChecker extends T
                 }
             }
         }
+        LOGGER.error("inactivity checker watcher thread terminates");
     }
 
 }