Register the task handler after it has been created as some tasks may need it

[hub.git] / application / hub / main / filter / task / apt-proxy / class_AptProxyTaskHandlerInitializerFilter.php

diff --git a/application/hub/main/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php b/application/hub/main/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php
index 3c673e5d3a84a0f24c43a12a01f8ea26b7738997..17e808a6276d2c15127747ab0d63ceb08d1684eb 100644 (file)
--- a/application/hub/main/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php
+++ b/application/hub/main/filter/task/apt-proxy/class_AptProxyTaskHandlerInitializerFilter.php
@@ -2,11 +2,11 @@
 /**
  * A TaskHandlerInitializer filter for apt-proxy
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 apt-proxy Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,7 +51,7 @@ class AptProxyTaskHandlerInitializerFilter extends BaseAptProxyFilter implements
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface
         * @return      void
-        * @throws      FilterChainException    If we need to interrupt the filter chain
+        * @throws      FilterChainException    If the filter chain needs to be interrupted
         * @todo        5% done
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
@@ -61,6 +61,9 @@ class AptProxyTaskHandlerInitializerFilter extends BaseAptProxyFilter implements
                // Get a new task handler instance
                $handlerInstance = ObjectFactory::createObjectByConfiguredName('task_handler_class');
 
+               // Put the task handler in registry
+               Registry::getRegistry()->addInstance('task_handler', $handlerInstance);
+
                /*
                 * Register all tasks:
                 *
@@ -68,9 +71,6 @@ class AptProxyTaskHandlerInitializerFilter extends BaseAptProxyFilter implements
                 */
                $taskInstance = ObjectFactory::createObjectByConfiguredName('apt_proxy_listener_task_class');
                $handlerInstance->registerTask('apt_proxy_listener', $taskInstance);
-
-               // Put the task handler in registry
-               Registry::getRegistry()->addInstance('task', $handlerInstance);
        }
 }