Push isBlank test upper, as in many cases it cannot be blank

1 files changed, 10 insertions, 11 deletions

diff --git a/main/src/cgeo/geocaching/cgeoapplication.java b/main/src/cgeo/geocaching/cgeoapplication.java
index f876552..1573b3f 100644
--- a/main/src/cgeo/geocaching/cgeoapplication.java
+++ b/main/src/cgeo/geocaching/cgeoapplication.java
@@ -299,23 +299,22 @@ public class cgeoapplication extends Application {
     }
 
     public cgCache getCacheByGeocode(String geocode) {
-        return getCacheByGeocode(geocode, false, true, false, false, false, false);
-    }
-
-    public cgCache getCacheByGeocode(String geocode, boolean loadAttributes, boolean loadWaypoints, boolean loadSpoilers, boolean loadLogs, boolean loadInventory, boolean loadOfflineLog) {
         if (StringUtils.isBlank(geocode)) {
             return null;
         }
 
-        cgCache cache = null;
+        return getCacheByGeocode(geocode, false, true, false, false, false, false);
+    }
+
+    public cgCache getCacheByGeocode(final String geocode, final boolean loadAttributes, final boolean loadWaypoints, final boolean loadSpoilers, final boolean loadLogs, final boolean loadInventory, final boolean loadOfflineLog) {
         if (cachesCache.containsKey(geocode)) {
-            cache = cachesCache.get(geocode);
-        } else {
-            cache = getStorage().loadCache(geocode, null, loadAttributes, loadWaypoints, loadSpoilers, loadLogs, loadInventory, loadOfflineLog);
+            return cachesCache.get(geocode);
+        }
 
-            if (cache != null && cache.detailed && loadAttributes && loadWaypoints && loadSpoilers && loadLogs && loadInventory) {
-                putCacheInCache(cache);
-            }
+        final cgCache cache = getStorage().loadCache(geocode, null, loadAttributes, loadWaypoints, loadSpoilers, loadLogs, loadInventory, loadOfflineLog);
+
+        if (cache != null && cache.detailed && loadAttributes && loadWaypoints && loadSpoilers && loadLogs && loadInventory) {
+            putCacheInCache(cache);
         }
 
         return cache;