diff -r 5c72fd91570d -r 594d15129e2c upnp/upnpstack/controlpointbase/src/upnpserviceinfo.cpp
--- a/upnp/upnpstack/controlpointbase/src/upnpserviceinfo.cpp	Tue Aug 31 16:06:48 2010 +0300
+++ b/upnp/upnpstack/controlpointbase/src/upnpserviceinfo.cpp	Wed Sep 01 12:27:00 2010 +0100
@@ -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,15 +253,16 @@
             User::Leave(KErrArgument);
             break;
             }
-
         }
     if(result == NULL)
         {
         // To avoid Coverity FORWARD_NULL errors
         User::Leave(KErrArgument);
         }
+    
     result->SetType( aType );
     iSessionId = result->SessionId();
+
     return result;
     }