summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/network/blackberry/NetworkManager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/platform/network/blackberry/NetworkManager.cpp')
-rw-r--r--Source/WebCore/platform/network/blackberry/NetworkManager.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebCore/platform/network/blackberry/NetworkManager.cpp b/Source/WebCore/platform/network/blackberry/NetworkManager.cpp
index bceb1da18..89d619c8b 100644
--- a/Source/WebCore/platform/network/blackberry/NetworkManager.cpp
+++ b/Source/WebCore/platform/network/blackberry/NetworkManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2009, 2010, 2011 Research In Motion Limited. All rights reserved.
+ * Copyright (C) 2009, 2010, 2011, 2012 Research In Motion Limited. All rights reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -160,10 +160,10 @@ NetworkJob* NetworkManager::findJobForHandle(PassRefPtr<ResourceHandle> job)
{
for (unsigned i = 0; i < m_jobs.size(); ++i) {
NetworkJob* networkJob = m_jobs[i];
- if (networkJob->handle() == job) {
- // We have only one job for one handle.
+ // We have only one job for one handle (not including cancelled jobs which may hang
+ // around briefly), so return the first non-cancelled job.
+ if (!networkJob->isCancelled() && networkJob->handle() == job)
return networkJob;
- }
}
return 0;
}