diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-06-02 21:14:31 +0000 |
| commit | 9db949eec327df4173fde3de934a87bedb0db13c (patch) | |
| tree | aeffa0f0e68b1d2ceb74d460cbbd22652c9cd159 /indra/test/lliohttpserver_tut.cpp | |
| parent | 419e13d0acaabf5e1e02e9b64a07648bce822b2f (diff) | |
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
Diffstat (limited to 'indra/test/lliohttpserver_tut.cpp')
| -rw-r--r-- | indra/test/lliohttpserver_tut.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; |