diff -r f5a58ecadc66 -r e84a4b44b2e8 upnp/upnpstack/controlpointbase/src/upnpserviceinfo.cpp --- a/upnp/upnpstack/controlpointbase/src/upnpserviceinfo.cpp Tue Feb 02 01:12:20 2010 +0200 +++ b/upnp/upnpstack/controlpointbase/src/upnpserviceinfo.cpp Fri Apr 16 15:55:43 2010 +0300 @@ -233,19 +233,19 @@ { result = RUpnpGenaMessageFactory::SubscribeL( subscribe, servAddress, aPath, timeoutBuf ); - break; + break; } case EResubscription: { result = RUpnpGenaMessageFactory::ResubscribeL( subscribe, servAddress, aPath, timeoutBuf ); - break; + break; } case EUnSubscription: { result = RUpnpGenaMessageFactory::UnsubscribeL( subscribe, servAddress, aPath); - break; + break; } default: { @@ -253,16 +253,15 @@ User::Leave(KErrArgument); break; } + } if(result == NULL) { // To avoid Coverity FORWARD_NULL errors User::Leave(KErrArgument); } - result->SetType( aType ); iSessionId = result->SessionId(); - return result; }