equal
deleted
inserted
replaced
1 // Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). |
1 // Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies). |
2 // All rights reserved. |
2 // All rights reserved. |
3 // This component and the accompanying materials are made available |
3 // This component and the accompanying materials are made available |
4 // under the terms of "Eclipse Public License v1.0" |
4 // under the terms of "Eclipse Public License v1.0" |
5 // which accompanies this distribution, and is available |
5 // which accompanies this distribution, and is available |
6 // at the URL "http://www.eclipse.org/legal/epl-v10.html". |
6 // at the URL "http://www.eclipse.org/legal/epl-v10.html". |
170 if(aMessage.Session() == iCurrentMessage->Session()) |
170 if(aMessage.Session() == iCurrentMessage->Session()) |
171 { |
171 { |
172 DEBUGPRINT1A("CStateAdaptationRequests cancelling current request as requested"); |
172 DEBUGPRINT1A("CStateAdaptationRequests cancelling current request as requested"); |
173 iStateAdaptation.RequestCancel(); |
173 iStateAdaptation.RequestCancel(); |
174 } |
174 } |
175 iPendingRequestsQueue.RemoveFromQueueAndComplete(aMessage); |
175 iPendingRequestsQueue.RemoveFromQueueAndComplete(aMessage); |
|
176 if(iPendingRequestsQueue.IsEmpty()) |
|
177 { |
|
178 iPendingRequestsQueue.Close(); |
|
179 } |
176 aMessage.Complete(KErrNone); |
180 aMessage.Complete(KErrNone); |
177 } |
181 } |
178 else |
182 else |
179 { |
183 { |
180 DEBUGPRINT1A("CStateAdaptationRequests nothing to cancel, but cancel requested"); |
184 DEBUGPRINT1A("CStateAdaptationRequests nothing to cancel, but cancel requested"); |