Merge "Fix the return of get accessor at Representation's Interface/Attributes" into tizen

1 files changed, 2 insertions, 2 deletions

diff --git a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Representation.cs b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Representation.cs
index 30fe764..81e6fbc 100755
--- a/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Representation.cs
+++ b/Tizen.Network.IoTConnectivity/Tizen.Network.IoTConnectivity/Representation.cs
@@ -191,7 +191,7 @@ namespace Tizen.Network.IoTConnectivity
                     Log.Error(IoTConnectivityErrorFactory.LogTag, "Failed to get interface");
                     return null;
                 }
-                return new ResourceInterfaces(interfaceHandle);
+                return (interfaceHandle == IntPtr.Zero) ? null : new ResourceInterfaces(interfaceHandle);
             }
             set
             {
@@ -236,7 +236,7 @@ namespace Tizen.Network.IoTConnectivity
                     Log.Error(IoTConnectivityErrorFactory.LogTag, "Failed to get attributes");
                     throw IoTConnectivityErrorFactory.GetException(ret);
                 }
-                return new Attributes(attributeHandle);
+                return (attributeHandle == IntPtr.Zero) ? null : new Attributes(attributeHandle);
             }
             set
             {