From 9db949eec327df4173fde3de934a87bedb0db13c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Mon, 2 Jun 2008 21:14:31 +0000 Subject: svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge dataserver-is-deprecated for-fucks-sake-whats-with-these-commit-markers --- indra/test/lliohttpserver_tut.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/test/lliohttpserver_tut.cpp') diff --git a/indra/test/lliohttpserver_tut.cpp b/indra/test/lliohttpserver_tut.cpp index 5ac79e6931..5401d1a8ae 100644 --- a/indra/test/lliohttpserver_tut.cpp +++ b/indra/test/lliohttpserver_tut.cpp @@ -125,7 +125,7 @@ namespace tut pump->addChain(chain, DEFAULT_CHAIN_EXPIRY_SECS); pumpPipe(pump, 10); - if(mResponse && (! timeout)) + if(mResponse.notNull() && (! timeout)) { mResponse->result(mResult); mResponse = NULL; @@ -138,7 +138,7 @@ namespace tut delete pump; apr_pool_destroy(pool); - if(mResponse && timeout) + if(mResponse.notNull() && timeout) { mResponse->result(mResult); mResponse = NULL; -- cgit v1.2.3