equal
deleted
inserted
replaced
459 #endif |
459 #endif |
460 |
460 |
461 if ( !iDMAuthInfo ) |
461 if ( !iDMAuthInfo ) |
462 { |
462 { |
463 aMessage.Complete( KErrNotFound ); |
463 aMessage.Complete( KErrNotFound ); |
|
464 return; |
464 } |
465 } |
465 aMessage.WriteL( 0, iDMAuthInfo->Ptr(0), 0 ); |
466 aMessage.WriteL( 0, iDMAuthInfo->Ptr(0), 0 ); |
466 aMessage.Complete( KErrNone ); |
467 aMessage.Complete( KErrNone ); |
467 _DBG_FILE("CNSmlSOSSession::GetDMAuthInfoL(): end"); |
468 _DBG_FILE("CNSmlSOSSession::GetDMAuthInfoL(): end"); |
468 } |
469 } |
1543 { |
1544 { |
1544 CNSmlHistoryLog* log = HistoryLogFromHandle( aMessage.Int3() ); |
1545 CNSmlHistoryLog* log = HistoryLogFromHandle( aMessage.Int3() ); |
1545 if ( !log ) |
1546 if ( !log ) |
1546 { |
1547 { |
1547 aMessage.Complete( KErrBadHandle ); |
1548 aMessage.Complete( KErrBadHandle ); |
|
1549 return; |
1548 } |
1550 } |
1549 log->ResetL(); |
1551 log->ResetL(); |
1550 aMessage.Complete(KErrNone); |
1552 aMessage.Complete(KErrNone); |
1551 } |
1553 } |
1552 |
1554 |
2231 |
2233 |
2232 default: |
2234 default: |
2233 break; |
2235 break; |
2234 }; |
2236 }; |
2235 |
2237 |
2236 |
2238 if ( buf ) |
2237 if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2239 { |
2238 { |
2240 if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2239 iProgressEventBuffer.Remove(0); |
2241 { |
2240 } |
2242 iProgressEventBuffer.Remove(0); |
2241 |
2243 } |
2242 delete buf; |
2244 |
2243 buf = NULL; |
2245 delete buf; |
2244 |
2246 buf = NULL; |
2245 |
2247 } |
2246 } |
2248 } |
2247 |
2249 |
2248 if ( !mutexError ) |
2250 if ( !mutexError ) |
2249 { |
2251 { |
2250 // Release mutex |
2252 // Release mutex |
2305 if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2307 if ( iHandler->CompleteBufProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2306 { |
2308 { |
2307 iProgressEventBuffer.Remove(0); |
2309 iProgressEventBuffer.Remove(0); |
2308 } |
2310 } |
2309 */ |
2311 */ |
2310 if ( iHandler->CompleteBufContactSuiteProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2312 if ( buf ) |
2311 { |
2313 { |
2312 iContactSuiteProgressEventBuffer.Remove(0); |
2314 if ( iHandler->CompleteBufContactSuiteProgressMsg( *buf, this )) // if owner not found do not remove from buffer |
2313 } |
2315 { |
2314 |
2316 iContactSuiteProgressEventBuffer.Remove(0); |
2315 delete buf; |
2317 } |
2316 buf = NULL; |
2318 |
2317 |
2319 delete buf; |
|
2320 buf = NULL; |
|
2321 } |
2318 |
2322 |
2319 } |
2323 } |
2320 |
2324 |
2321 if ( !mutexError ) |
2325 if ( !mutexError ) |
2322 { |
2326 { |