no longer throwing exceptions for 404 errors in Request (refs #4556)

kohana · Oct 14, 2012 · e515c27 · e515c27 · taai · Oct 22, 2012
1 parent 67c716f
commit e515c27
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/classes/Kohana/Request.php b/classes/Kohana/Request.php
@@ -974,9 +974,10 @@ public function execute()
 
 		if ( ! $this->_route instanceof Route)
 		{
-			throw HTTP_Exception::factory(404, 'Unable to find a route to match the URI: :uri', array(
+			return HTTP_Exception::factory(404, 'Unable to find a route to match the URI: :uri', array(
 				':uri' => $this->_uri,
-			))->request($this);
+			))->request($this)
+				->get_response();
 		}
 
 		if ( ! $this->_client instanceof Request_Client)

diff --git a/tests/kohana/RequestTest.php b/tests/kohana/RequestTest.php
@@ -75,8 +75,6 @@ public function test_initial()
 
 	/**
 	 * Tests that the allow_external flag prevents an external request.
-	 * 
-	 * @expectedException HTTP_Exception_404
 	 *
 	 * @return null
 	 */
@@ -89,7 +87,8 @@ public function test_disable_external_tests()
 		);
 
 		$request = new Request('http://www.google.com/', array(), FALSE);
-		$request->execute();
+
+		$this->assertEquals(FALSE, $request->is_external());
 	}
 
 	/**