equal
deleted
inserted
replaced
113 { |
113 { |
114 aMessage.Complete( KErrServerBusy ); |
114 aMessage.Complete( KErrServerBusy ); |
115 return; |
115 return; |
116 } |
116 } |
117 |
117 |
|
118 if( iServer.ShutdownInProgress() ) |
|
119 { |
|
120 aMessage.Complete( KErrServerTerminated ); |
|
121 return; |
|
122 } |
|
123 |
118 TRAPD( err, ServiceFunctionL( aMessage ) ); |
124 TRAPD( err, ServiceFunctionL( aMessage ) ); |
119 if( err != KErrNone ) |
125 if( err != KErrNone ) |
120 { |
126 { |
121 aMessage.Complete( err ); |
127 aMessage.Complete( err ); |
122 } |
128 } |
636 __LOGLB( ELogServer, "-> Find Continue" ); |
642 __LOGLB( ELogServer, "-> Find Continue" ); |
637 |
643 |
638 CMdSFindEngine* findEngine = NULL; |
644 CMdSFindEngine* findEngine = NULL; |
639 |
645 |
640 const TUint32 queryId = (TUint32)aMsg.Int0(); |
646 const TUint32 queryId = (TUint32)aMsg.Int0(); |
641 |
647 |
642 const TInt count = iFindEngines.Count(); |
|
643 |
|
644 TInt feIndex = 0; |
648 TInt feIndex = 0; |
645 |
649 |
646 for( TInt i = 0; i < count; i++ ) |
650 for( TInt i = iFindEngines.Count() - 1; i >=0; i-- ) |
647 { |
651 { |
648 if( queryId == iFindEngines[i]->QueryId() ) |
652 if( queryId == iFindEngines[i]->QueryId() ) |
649 { |
653 { |
650 findEngine = iFindEngines[i]; |
654 findEngine = iFindEngines[i]; |
651 |
655 |
682 { |
686 { |
683 __LOGLB( ELogServer, "-> Find Cancel" ); |
687 __LOGLB( ELogServer, "-> Find Cancel" ); |
684 |
688 |
685 const TUint32 queryId = (TUint32)aMsg.Int0(); |
689 const TUint32 queryId = (TUint32)aMsg.Int0(); |
686 |
690 |
687 const TInt count = iFindEngines.Count(); |
691 for( TInt i = iFindEngines.Count() - 1; i >=0; i-- ) |
688 |
|
689 for( TInt i = 0; i < count; i++ ) |
|
690 { |
692 { |
691 CMdSFindEngine* findEngine = iFindEngines[i]; |
693 CMdSFindEngine* findEngine = iFindEngines[i]; |
692 |
694 |
693 if( queryId == findEngine->QueryId() ) |
695 if( queryId == findEngine->QueryId() ) |
694 { |
696 { |
1193 // --------------------------------------------------------------------------- |
1195 // --------------------------------------------------------------------------- |
1194 // |
1196 // |
1195 void CMdSServerSession::ShutdownL( const RMessage2& /*aMsg*/ ) |
1197 void CMdSServerSession::ShutdownL( const RMessage2& /*aMsg*/ ) |
1196 { |
1198 { |
1197 __LOGLB( ELogServer, "-> Shutdown session" ); |
1199 __LOGLB( ELogServer, "-> Shutdown session" ); |
1198 |
1200 |
1199 const TInt count = iFindEngines.Count(); |
1201 for( TInt i = iFindEngines.Count() - 1; i >=0; i-- ) |
1200 |
|
1201 for( TInt i = 0; i < count; i++ ) |
|
1202 { |
1202 { |
1203 CMdSFindEngine* fe = iFindEngines[i]; |
1203 CMdSFindEngine* fe = iFindEngines[i]; |
1204 |
1204 |
1205 fe->Cancel( KErrNone ); |
1205 fe->Cancel( KErrNone ); |
1206 } |
1206 } |