Merge "Comment out RemoveAll() of List & Map in example code" into tizen_2.1

diff --git a/inc/FAppPkgPackageInfo.h b/inc/FAppPkgPackageInfo.h
index 0e6c2e6..ab2c978 100644 (file)
--- a/inc/FAppPkgPackageInfo.h
+++ b/inc/FAppPkgPackageInfo.h
@@ -228,7 +228,7 @@ public:
         *
         * @since       2.0
         * @privlevel   platform
-        * @privilege   %http://tizen.org/privilege/package.setting
+        * @privilege   %http://tizen.org/privilege/packagemanager.setting
         *
         * @return The package type
         */

diff --git a/inc/FAppPkgPackageManager.h b/inc/FAppPkgPackageManager.h
index dc234f0..88ba150 100644 (file)
--- a/inc/FAppPkgPackageManager.h
+++ b/inc/FAppPkgPackageManager.h
@@ -228,7 +228,7 @@ public:
         *
         * @since       2.0
         * @privlevel   platform
-        * @privilege   %http://tizen.org/privilege/package.setting
+        * @privilege   %http://tizen.org/privilege/packagemanager.setting
         *
         * @return              An error code
         * @param[in]   packageId                               The package ID
@@ -247,7 +247,7 @@ public:
         *
         * @since       2.0
         * @privlevel   platform
-        * @privilege   %http://tizen.org/privilege/package.setting
+        * @privilege   %http://tizen.org/privilege/packagemanager.setting
         *
         * @return              An error code
         * @param[in]   packageId                               The package ID

diff --git a/src/base/runtime/FBaseRt_MutexImpl.cpp b/src/base/runtime/FBaseRt_MutexImpl.cpp
index 3611f4a..6a9f206 100755 (executable)
--- a/src/base/runtime/FBaseRt_MutexImpl.cpp
+++ b/src/base/runtime/FBaseRt_MutexImpl.cpp
@@ -85,11 +85,7 @@ _MutexImpl::CreateNonRecursiveMutex(void)
        return E_SUCCESS;
 
 CATCH:
-       if (pMutex != null)
-       {
-               free(pMutex);
-       }
-
+       free(pMutex);
        return r;
 
 }