diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-19 17:18:07 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-19 17:18:07 +0000 |
| commit | 5867e016e7b398e86abf36d1c0b1c2909bc1ad98 (patch) | |
| tree | 072174d2783e96c82aa37885b294ff1afe8585ae /net/ocsp | |
| parent | d6bbd29389124100f174e1e94601454a94ec923a (diff) | |
| download | chromium_src-5867e016e7b398e86abf36d1c0b1c2909bc1ad98.zip chromium_src-5867e016e7b398e86abf36d1c0b1c2909bc1ad98.tar.gz chromium_src-5867e016e7b398e86abf36d1c0b1c2909bc1ad98.tar.bz2 | |
Revert "net: add OCSP tests."
This reverts commit r127486. Looks like it's broken on Windows XP only.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ocsp')
| -rw-r--r-- | net/ocsp/nss_ocsp.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/net/ocsp/nss_ocsp.cc b/net/ocsp/nss_ocsp.cc index 80f9db0..07cd019 100644 --- a/net/ocsp/nss_ocsp.cc +++ b/net/ocsp/nss_ocsp.cc @@ -49,8 +49,6 @@ class OCSPIOLoop { void StartUsing() { base::AutoLock autolock(lock_); used_ = true; - io_loop_ = MessageLoopForIO::current(); - DCHECK(io_loop_); } // Called on IO loop. @@ -458,7 +456,8 @@ class OCSPServerSession { OCSPIOLoop::OCSPIOLoop() : shutdown_(false), used_(false), - io_loop_(NULL) { + io_loop_(MessageLoopForIO::current()) { + DCHECK(io_loop_); } OCSPIOLoop::~OCSPIOLoop() { @@ -513,6 +512,13 @@ void OCSPIOLoop::AddRequest(OCSPRequestSession* request) { } void OCSPIOLoop::RemoveRequest(OCSPRequestSession* request) { + { + // Ignore if we've already shutdown. + base::AutoLock auto_lock(lock_); + if (shutdown_) + return; + } + DCHECK(ContainsKey(requests_, request)); requests_.erase(request); } |