diff options
author | Shane Kearns <ext-shane.2.kearns@nokia.com> | 2012-05-31 16:09:38 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 15:19:42 +0200 |
commit | bae1613c4c3d8c38b90ed2ba5c1b149e1bc87987 (patch) | |
tree | cb7d38a1a0cb1ca84e7558f374ff2bb29d68a1fa /src/network/access/qnetworkaccessbackend.cpp | |
parent | 3580168c3e357c2289acddc5f2515a3ad306ef2b (diff) | |
download | qtbase-bae1613c4c3d8c38b90ed2ba5c1b149e1bc87987.tar.gz |
QNAM - maintain a weak reference to the QNetworkSession
When handling signals from the session, a pointer is needed.
Also the QNetworkReplyImpl needs to access the manager's session.
So, the manager should have a strong and weak reference.
The strong reference is held during connection establishment.
The weak reference is held all the time, though it will become
null when the session is destroyed in idle.
The non static member function getNetworkSession() is used to
create strong references from the weak reference where required.
Task-number: ou1cimx#1004278
Change-Id: I4b5b36b1d996b98e659d993969006c61b4440c15
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
Diffstat (limited to 'src/network/access/qnetworkaccessbackend.cpp')
-rw-r--r-- | src/network/access/qnetworkaccessbackend.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp index f99869621f..d5f3007831 100644 --- a/src/network/access/qnetworkaccessbackend.cpp +++ b/src/network/access/qnetworkaccessbackend.cpp @@ -358,13 +358,14 @@ bool QNetworkAccessBackend::start() { #ifndef QT_NO_BEARERMANAGEMENT // For bearer, check if session start is required - if (manager->networkSession) { + QSharedPointer<QNetworkSession> networkSession(manager->getNetworkSession()); + if (networkSession) { // session required - if (manager->networkSession->isOpen() && - manager->networkSession->state() == QNetworkSession::Connected) { + if (networkSession->isOpen() && + networkSession->state() == QNetworkSession::Connected) { // Session is already open and ready to use. // copy network session down to the backend - setProperty("_q_networksession", QVariant::fromValue(manager->networkSession)); + setProperty("_q_networksession", QVariant::fromValue(networkSession)); } else { // Session not ready, but can skip for loopback connections @@ -386,7 +387,7 @@ bool QNetworkAccessBackend::start() #ifndef QT_NO_BEARERMANAGEMENT // Get the proxy settings from the network session (in the case of service networks, // the proxy settings change depending which AP was activated) - QNetworkSession *session = manager->networkSession.data(); + QNetworkSession *session = networkSession.data(); QNetworkConfiguration config; if (session) { QNetworkConfigurationManager configManager; |