From 40b06f3eff0c5fcc52b5473737f31094536e9bca Mon Sep 17 00:00:00 2001
From: Ciro Mattia Gonano <ciromattia@gmail.com>
Date: Fri, 13 Sep 2013 10:40:10 +0200
Subject: Update to r3325

---
 framework/pradolite.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'framework/pradolite.php')

diff --git a/framework/pradolite.php b/framework/pradolite.php
index f9ea93d3..af40799f 100644
--- a/framework/pradolite.php
+++ b/framework/pradolite.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * File Name: pradolite.php
- * Last Update: 2013/09/12 10:36:21
+ * Last Update: 2013/09/13 10:37:17
  * Generated By: buildscripts/phpbuilder/build.php
  *
  * This file is used in lieu of prado.php to boost PRADO application performance.
@@ -69,7 +69,7 @@ class PradoBase
 	}
 	public static function setApplication($application)
 	{
-		if(self::$_application!==null)
+		if(self::$_application!==null && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_application_singleton_required');
 		self::$_application=$application;
 	}
@@ -197,7 +197,7 @@ class PradoBase
 	}
 	public static function setPathOfAlias($alias,$path)
 	{
-		if(isset(self::$_aliases[$alias]))
+		if(isset(self::$_aliases[$alias]) && !defined('PRADO_TEST_RUN'))
 			throw new TInvalidOperationException('prado_alias_redefined',$alias);
 		else if(($rp=realpath($path))!==false && is_dir($rp))
 		{
-- 
cgit v1.2.3