TouchInstinct
/
RoboSwag-core
308
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix of storable conversion thread

This commit is contained in:
Gavriil Sitnikov 2016-12-26 18:33:19 +03:00
parent 4a2bebf5a4
commit 4fa37d9353
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/ru/touchin/roboswag/core/observables/storable/Storable.java
View File

@ -95,7 +95,7 @@ public class Storable<TKey, TObject, TStoreObject> {
final ObserveStrategy nonNullObserveStrategy = observeStrategy != null ? observeStrategy : getDefaultGetStrategy();
final Observable<TStoreObject> storeValueObservable
= createStoreValueObservable(nonNullObserveStrategy, migration, defaultValue, storeScheduler);
valueObservable = createValueObservable(storeValueObservable, nonNullObserveStrategy);
valueObservable = createValueObservable(storeValueObservable, nonNullObserveStrategy, storeScheduler);
}
@NonNull
@ -156,7 +156,8 @@ public class Storable<TKey, TObject, TStoreObject> {
@NonNull
private Observable<TObject> createValueObservable(@NonNull final Observable<TStoreObject> storeValueObservable,
@NonNull final ObserveStrategy observeStrategy) {
@NonNull final ObserveStrategy observeStrategy,
@Nullable final Scheduler storeScheduler) {
final Observable<TObject> result = storeValueObservable
.map(storeObject -> {
try {
@ -169,7 +170,8 @@ public class Storable<TKey, TObject, TStoreObject> {
STORABLE_LC_GROUP.assertion(throwable);
throw OnErrorThrowable.from(throwable);
}
});
})
.subscribeOn(storeScheduler != null ? storeScheduler : Schedulers.computation());
return observeStrategy == ObserveStrategy.CACHE_ACTUAL_VALUE ? result : result.replay(1).refCount();
}