From 992681a6180757f239addcf2353f946a7fbd0be7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 14 Dec 2011 04:48:40 +0000
Subject: [PATCH] Fixed conflict with 'core' project

---
 .../hub/main/resolver/state/class_BaseStateResolver.php   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/hub/main/resolver/state/class_BaseStateResolver.php b/application/hub/main/resolver/state/class_BaseStateResolver.php
index ac05a5556..4b8d3f3eb 100644
--- a/application/hub/main/resolver/state/class_BaseStateResolver.php
+++ b/application/hub/main/resolver/state/class_BaseStateResolver.php
@@ -84,12 +84,12 @@ class BaseStateResolver extends BaseResolver {
 
 	/**
 	 * "Loads" a given state and instances it if not yet cached. If the
-	 * state was not found an InvalidStateException is thrown
+	 * state was not found an UnresolveableStateException is thrown
 	 *
 	 * @param	$stateName			A state name we shall look for
 	 * @return	$stateInstance		A loaded state instance
-	 * @throws	InvalidStateException	Thrown if even the requested
-	 *									state class is missing (bad!)
+	 * @throws	UnresolveableStateException		Thrown if even the requested
+	 *											state class is missing (bad!)
 	 */
 	protected function loadState ($stateName) {
 		// Init state instance
@@ -104,7 +104,7 @@ class BaseStateResolver extends BaseResolver {
 		// Is this class loaded?
 		if (!class_exists($this->getClassName())) {
 			// Throw an exception here
-			throw new InvalidStateException(array($this, $stateName), self::EXCEPTION_INVALID_STATE);
+			throw new UnresolveableStateException(array($this, $stateName), self::EXCEPTION_INVALID_STATE);
 		} // END - if
 
 		// Initialize the state
-- 
2.39.5