Merge from master.

[framework/messaging/msg-service.git] / plugin / mms_plugin / MmsPluginConnManWrapper.cpp

diff --git a/plugin/mms_plugin/MmsPluginConnManWrapper.cpp b/plugin/mms_plugin/MmsPluginConnManWrapper.cpp
index e034a69..ad6f1bd 100755 (executable)
--- a/plugin/mms_plugin/MmsPluginConnManWrapper.cpp
+++ b/plugin/mms_plugin/MmsPluginConnManWrapper.cpp
@@ -439,10 +439,8 @@ int MmsPluginCmAgent::getProxyPort()
 
        if (proxyAddrLength > 0) {
                char *pPort = strchr(mmsProfile.ProfileInfo.Pdp.net_info.ProxyAddr, ':') + 1;
-               if (pPort)
-                       return atoi(pPort);
-               else
-                       return -1;
+               /* pPort cannot be NULL */
+               return atoi(pPort);
        }
 
        return -1;