From 4ed6d0cc7c6b8be97c69fd4061f431442715b3b1 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Mon, 10 Mar 2014 14:40:03 +0100
Subject: Use basic synchronization on infrequent access pattern

---
 main/src/cgeo/geocaching/CgeoApplication.java | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'main/src/cgeo/geocaching/CgeoApplication.java')

diff --git a/main/src/cgeo/geocaching/CgeoApplication.java b/main/src/cgeo/geocaching/CgeoApplication.java
index d34b70b..bb74b52 100644
--- a/main/src/cgeo/geocaching/CgeoApplication.java
+++ b/main/src/cgeo/geocaching/CgeoApplication.java
@@ -70,18 +70,14 @@ public class CgeoApplication extends Application {
         }.start();
     }
 
-    public Observable<ImmutablePair<IGeoData, Float>> geoDirObservable() {
+    public synchronized Observable<ImmutablePair<IGeoData, Float>> geoDirObservable() {
         if (geoDir == null) {
-            synchronized(this) {
-                if (geoDir == null) {
-                    geoDir = Observable.combineLatest(GeoDataProvider.create(this), DirectionProvider.create(this), new Func2<IGeoData, Float, ImmutablePair<IGeoData, Float>>() {
-                        @Override
-                        public ImmutablePair<IGeoData, Float> call(final IGeoData geoData, final Float dir) {
-                            return new ImmutablePair<IGeoData, Float>(geoData, dir);
-                        }
-                    });
+            geoDir = Observable.combineLatest(GeoDataProvider.create(this), DirectionProvider.create(this), new Func2<IGeoData, Float, ImmutablePair<IGeoData, Float>>() {
+                @Override
+                public ImmutablePair<IGeoData, Float> call(final IGeoData geoData, final Float dir) {
+                    return new ImmutablePair<IGeoData, Float>(geoData, dir);
                 }
-            }
+            });
         }
         return geoDir;
     }
-- 
cgit v1.1