updated exception reporting scheme when expression is invalid.

1 files changed, 8 insertions, 2 deletions

diff --git a/framework/TComponent.php b/framework/TComponent.php
index 54fe7ec7..5f907082 100644
--- a/framework/TComponent.php
+++ b/framework/TComponent.php
@@ -389,7 +389,10 @@ class TComponent
 		}

 		catch(Exception $e)

 		{

-			throw new TInvalidOperationException('component_expression_invalid',get_class($this),$expression,$e->getMessage());

+			if($e instanceof TException)

+				throw $e;

+			else

+				throw new TInvalidOperationException('component_expression_invalid',get_class($this),$expression,$e->getMessage());

 		}

 	}

 

@@ -412,7 +415,10 @@ class TComponent
 		}

 		catch(Exception $e)

 		{

-			throw new TInvalidOperationException('component_statements_invalid',get_class($this),$statements,$e->getMessage());

+			if($e instanceof TException)

+				throw $e;

+			else

+				throw new TInvalidOperationException('component_statements_invalid',get_class($this),$statements,$e->getMessage());

 		}

 	}