Correction exception

diefferson · Nov 11, 2018 · 241b844 · 241b844
1 parent e470292
commit 241b844
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/library/src/main/java/io/coroutines/cache/core/CoroutinesCache.kt b/library/src/main/java/io/coroutines/cache/core/CoroutinesCache.kt
@@ -20,7 +20,7 @@ open class CoroutinesCache(private var context: Context): CoroutineScope{
 
     fun getDataBase() =  Room.databaseBuilder(context, LocalDatabase::class.java, context.packageName+CACHE_PREFIX).build().cacheDao()
 
-    inline fun <reified T:Any> asyncCache(noinline source: suspend ()->T, key: String, forceSource:Boolean): Deferred<T> {
+    inline fun <reified T:Any> asyncCache(noinline source: suspend ()->Deferred<T>, key: String, forceSource:Boolean): Deferred<T> {
         return if (forceSource) {
             getFromSource(source, key)
         } else {
@@ -32,24 +32,19 @@ open class CoroutinesCache(private var context: Context): CoroutineScope{
         }
     }
 
-    fun <T> getFromSource(source: suspend ()->T, key: String):Deferred<T>{
+    fun <T> getFromSource(source: suspend ()->Deferred<T>, key: String):Deferred<T>{
         return async {
-            val response = source()
-            getDataBase().insert(Cache(key, Gson().toJson(response)))
-            response
+            val result = source().await()
+            getDataBase().insert(Cache(key, Gson().toJson(result)))
+            result
         }
     }
 
     inline fun <reified T:Any> getFromCache(key: String): T? {
         val resultDb = getDataBase().get(key)?.data
         return if (resultDb != null) {
-            try {
-                val listType = object : TypeToken<T>() {}.type
-                Gson().fromJson(resultDb, listType) as T
-            }catch (e:StackOverflowError){
-                Gson().fromJson<T>(resultDb, T::class.java) as T
-            }
-
+            val listType = object : TypeToken<T>() {}.type
+            Gson().fromJson(resultDb, listType) as T
         } else {
             return null
         }
@@ -59,4 +54,3 @@ open class CoroutinesCache(private var context: Context): CoroutineScope{
         private const val CACHE_PREFIX = "cache"
     }
 }
-