Merge branch 'master' of /var/cache/git/repos/hub into refacuring/protocol_handler

[hub.git] / application / hub / main / states / dht / class_BaseDhtState.php

diff --git a/application/hub/main/states/dht/class_BaseDhtState.php b/application/hub/main/states/dht/class_BaseDhtState.php
index 88c2de0c645ca90128b5fbb1ecd21ac0e8b47fc0..efc3b51c0cc5d5bb2898aca5d5e6471dbe3999f5 100644 (file)
--- a/application/hub/main/states/dht/class_BaseDhtState.php
+++ b/application/hub/main/states/dht/class_BaseDhtState.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Hub Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Hub Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  * @todo               Create generic DHT interface
@@ -41,9 +41,9 @@ class BaseDhtState extends BaseState {
         * @return      void
         * @throws      InvalidStateException   If the state is not 'virgin'
         */
-       public function validateDhtStateIsVirgin () {
+       public function validateDhtStateIsVirginOrInit () {
                // Just compare it...
-               if (!$this instanceof DhtVirginState) {
+               if ((!$this instanceof DhtVirginState) && (!$this instanceof DhtInitState)) {
                        // Throw the exception
                        throw new InvalidStateException($this, self::EXCEPTION_INVALID_STATE);
                } // END - if