Merge branch '0.8.x' into 0.9.x

[quix0rs-gnu-social.git] / lib / stompqueuemanager.php

diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 359f6d9d86b78bf63ae684a5a5b46dc50af4e1bb..f059b42f0095f69f5db827bbf3f5698d128f87ba 100644 (file)
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Abstract class for queue managers
  *
@@ -20,12 +20,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  QueueManager
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 require_once 'Stomp.php';
@@ -122,13 +122,7 @@ class StompQueueManager
                 if (in_array($stompsock, $read)) {
                     $this->_handleNotice($queue, $handler);
                 }
-                foreach ($handsocks as $sock) {
-                    if (in_array($sock, $read)) {
-                        // let it really handle this stuff
-                        $handler->idle(QUEUE_HANDLER_MISS_IDLE);
-                        break;
-                    }
-                }
+                $handler->idle(QUEUE_HANDLER_HIT_IDLE);
             }
         }