webservices/wscore/src/sencoreservicemanager.cpp
changeset 1 272b002df977
parent 0 62f9d29f7211
child 14 ab1e518f96da
child 23 a1df79fa35b4
equal deleted inserted replaced
0:62f9d29f7211 1:272b002df977
   632     TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMaxLogLevel, _L8(" - Contract: '%S'"),&contract));
   632     TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMaxLogLevel, _L8(" - Contract: '%S'"),&contract));
   633 #endif
   633 #endif
   634 
   634 
   635     if ( contract.Length() == 0 && endpoint.Length() == 0 )
   635     if ( contract.Length() == 0 && endpoint.Length() == 0 )
   636         {
   636         {
   637         delete apServiceDescription;
   637 
   638         apServiceDescription = NULL;
       
   639         TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,"CSenCoreServiceManager::AddServiceDescriptionL()");
   638         TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,"CSenCoreServiceManager::AddServiceDescriptionL()");
   640         TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel," - No endpoint & no contract: invalid SD NOT added!");
   639         TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel," - No endpoint & no contract: invalid SD NOT added!");
   641         return KErrSenNoContractNoEndPoint;
   640         return KErrSenNoContractNoEndPoint;
   642         }
   641         }
   643 
   642 
   663                 TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,"CSenCoreServiceManager::AddServiceDescriptionL()");
   662                 TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,"CSenCoreServiceManager::AddServiceDescriptionL()");
   664                 TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel," - Could NOT add as new SD. Deleting this orphan.");
   663                 TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel," - Could NOT add as new SD. Deleting this orphan.");
   665                 TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMinLogLevel, _L8(" - error code: %d"),retVal));
   664                 TLSLOG_FORMAT((KSenCoreServiceManagerLogChannelBase  , KMinLogLevel, _L8(" - error code: %d"),retVal));
   666 
   665 
   667                 // delete the new instance and return error (to framework)
   666                 // delete the new instance and return error (to framework)
   668                 delete apServiceDescription;
   667              
   669                 apServiceDescription = NULL;
       
   670                 return retVal; 
   668                 return retVal; 
   671                 }
   669                 }
   672 #ifdef _SENDEBUG
   670 #ifdef _SENDEBUG
   673             else
   671             else
   674                 {
   672                 {
   683             // Failed to remove duplicate SD from database
   681             // Failed to remove duplicate SD from database
   684             TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,"CSenCoreServiceManager::AddServiceDescriptionL()");
   682             TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel,"CSenCoreServiceManager::AddServiceDescriptionL()");
   685             TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel," - Remove duplicate SD failed. Returning error.");
   683             TLSLOG_L(KSenCoreServiceManagerLogChannelBase  , KMinLogLevel," - Remove duplicate SD failed. Returning error.");
   686 
   684 
   687             // delete the new instance and return error (to framework)
   685             // delete the new instance and return error (to framework)
   688             delete apServiceDescription;
   686             
   689             apServiceDescription = NULL;
       
   690             return KErrGeneral; 
   687             return KErrGeneral; 
   691             }
   688             }
   692 
   689 
   693         }
   690         }
   694     else
   691     else