Merge from 2.2

[platform/framework/native/telephony.git] / src / FTel_NetworkManagerEventArg.cpp

diff --git a/src/FTel_NetworkManagerEventArg.cpp b/src/FTel_NetworkManagerEventArg.cpp
old mode 100644 (file)
new mode 100755 (executable)
index e342936..e0d4c2c
--- a/src/FTel_NetworkManagerEventArg.cpp
+++ b/src/FTel_NetworkManagerEventArg.cpp
@@ -34,9 +34,15 @@ _NetworkManagerEventArg::_NetworkManagerEventArg(void)
 
 _NetworkManagerEventArg::_NetworkManagerEventArg(const NetworkStatus& networkstatus)
 {
-    _NetworkStatusImpl::GetInstance(__networkStatus)->SetIsCallServiceAvailable(networkstatus.IsCallServiceAvailable());
-    _NetworkStatusImpl::GetInstance(__networkStatus)->SetIsDataServiceAvailable(networkstatus.IsDataServiceAvailable());
-    _NetworkStatusImpl::GetInstance(__networkStatus)->SetIsRoaming(networkstatus.IsRoaming());
+       _NetworkStatusImpl* pThis = _NetworkStatusImpl::GetInstance(__networkStatus);
+       const _NetworkStatusImpl* pOther = _NetworkStatusImpl::GetInstance(networkstatus);
+
+       if ((pThis != null) && (pOther != null))
+       {
+               pThis->SetIsCallServiceAvailable(pOther->IsCallServiceAvailable());
+               pThis->SetIsDataServiceAvailable(pOther->IsDataServiceAvailable());
+               pThis->SetIsRoaming(pOther->IsRoaming());
+       }
 }
 
 const NetworkStatus&