fix deadlock issue from previos modification 24/90824/1 accepted/tizen/3.0/mobile/20161015.032218 accepted/tizen/3.0/tv/20161016.003334 accepted/tizen/3.0/wearable/20161015.080301 accepted/tizen/common/20161005.165417 accepted/tizen/ivi/20161007.003918 accepted/tizen/mobile/20161007.003635 accepted/tizen/tv/20161007.003808 accepted/tizen/wearable/20161007.003845 submit/tizen/20161005.055916 submit/tizen_3.0_mobile/20161015.000000 submit/tizen_3.0_tv/20161015.000000 submit/tizen_3.0_wearable/20161015.000000
authorYong Yeon Kim <yy9875.kim@samsung.com>
Tue, 4 Oct 2016 10:02:24 +0000 (19:02 +0900)
committerYong Yeon Kim <yy9875.kim@samsung.com>
Tue, 4 Oct 2016 10:02:53 +0000 (19:02 +0900)
Change-Id: Ie132bd42f1e00d55b2790cd64146b2ea07624109

src/media_db.c

index 213257c..dfea821 100755 (executable)
@@ -204,9 +204,7 @@ static int __media_db_make_query(filter_h filter, attribute_h attr, char *select
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        filter_s *_filter = NULL;
-#ifdef _USE_TV_PROFILE
-       g_mutex_lock(_content_get_db_mutex());
-#endif
+
        if (filter != NULL) {
                _filter = (filter_s*)filter;
 
@@ -221,22 +219,12 @@ static int __media_db_make_query(filter_h filter, attribute_h attr, char *select
                        SAFE_STRLCAT(bracket_added_condition, QUERY_KEYWORD_BRACKET, MAX_QUERY_SIZE);
 
                        ret = _media_filter_attribute_generate(attr, bracket_added_condition, _filter->condition_collate_type, condition_query);
-#ifdef _USE_TV_PROFILE
-                       if (ret != MEDIA_CONTENT_ERROR_NONE) {
-                               g_mutex_unlock(_content_get_db_mutex());
-                               return ret;
-                       }
-#else
                        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
-#endif
                }
 
                ret = _media_filter_attribute_option_generate(attr, filter, option_query);
                if (ret != MEDIA_CONTENT_ERROR_NONE) {
                        SAFE_FREE(*condition_query);
-#ifdef _USE_TV_PROFILE
-                       g_mutex_unlock(_content_get_db_mutex());
-#endif
                        return ret;
                }
 
@@ -245,9 +233,6 @@ static int __media_db_make_query(filter_h filter, attribute_h attr, char *select
                        SAFE_STRLCAT(select_query, QUERY_KEYWORD_AND, select_query_size);
                }
        }
-#ifdef _USE_TV_PROFILE
-       g_mutex_unlock(_content_get_db_mutex());
-#endif
 
        return ret;
 }