Add null checker for internal handler

Change-Id: Ib60c493c8aa47687d9c176197f6974919031b794
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/packaging/csapi-media-content.spec b/packaging/csapi-media-content.spec
index 74088c5..3c958ca 100755 (executable)
--- a/packaging/csapi-media-content.spec
+++ b/packaging/csapi-media-content.spec
@@ -1,6 +1,6 @@
 Name:       csapi-media-content
 Summary:    Tizen Media Content API for C#
-Version:    1.0.10
+Version:    1.0.11
 Release:    1
 Group:      Development/Libraries
 License:    Apache-2.0

diff --git a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs
index 43f3d98..dcf341e 100755 (executable)
--- a/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs
+++ b/src/Tizen.Content.MediaContent/Tizen.Content.MediaContent/ContentDatabase.cs
@@ -210,18 +210,23 @@ namespace Tizen.Content.MediaContent
                 MediaContentValidator.ThrowIfError(
                     Interop.Folder.GetFolderFromDb(id, out handle), "Failed to get information");
 
-                result = new MediaFolder(handle);
+                if (handle != IntPtr.Zero)\r
+                {\r
+                    result = new MediaFolder(handle);\r
+                    return (T)result;\r
+                }
 
-                return (T)result;
             }
             else if (typeof(T) == typeof(Storage))
             {
                 MediaContentValidator.ThrowIfError(
                     Interop.Storage.GetStorageInfoFromDb(id, out handle), "Failed to get information");
 
-                result = new Storage(handle);
-
-                return (T)result;
+                if (handle != IntPtr.Zero)\r
+                {\r
+                    result = new Storage(handle);\r
+                    return (T)result;\r
+                }
             }
 
             return null;
@@ -245,27 +250,33 @@ namespace Tizen.Content.MediaContent
                 MediaContentValidator.ThrowIfError(
                     Interop.Playlist.GetPlaylistFromDb(id, out handle), "Failed to get information");
 
-                result = new PlayList(handle);
-
-                return (T)result;
+                if (handle != IntPtr.Zero)\r
+                {\r
+                    result = new PlayList(handle);\r
+                    return (T)result;\r
+                }
             }
             else if (typeof(T) == typeof(Album))
             {
                 MediaContentValidator.ThrowIfError(
                 Interop.Group.MediaAlbumGetAlbumFromDb(id, out handle), "Failed to get information");
 
-                result = new Album(handle);
-
-                return (T)result;
+                if (handle != IntPtr.Zero)\r
+                {\r
+                    result = new Album(handle);\r
+                    return (T)result;\r
+                }
             }
             else if (typeof(T) == typeof(Tag))
             {
                 MediaContentValidator.ThrowIfError(
                     Interop.Tag.GetTagFromDb(id, out handle), "Failed to get information");
 
-                result = new Tag(handle);
-
-                return (T)result;
+                if (handle != IntPtr.Zero)\r
+                {\r
+                    result = new Tag(handle);\r
+                    return (T)result;\r
+                }
             }
 
             return null;