commit 43278eea6e5a8e7f34f0c63509968c01b56e2364
author Gabriel Peal <gabriel.peal@airbnb.com> Wed Feb 08 23:12:16 2017 -0800
committer Gabriel Peal <gabriel.peal@airbnb.com> Wed Feb 08 23:12:16 2017 -0800
tree 14e56525dec6762b12a6f575755111756e5c22db
parent aa77c155c0babb6a67b02816cc46b0a8a15ef7c1

Initialize caches inline

Fixes #59

lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java

diff --git a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
index 7cd0e57..5356450 100644
--- a/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
+++ b/lottie/src/main/java/com/airbnb/lottie/LottieAnimationView.java
@@ -50,8 +50,9 @@
     Strong
   }
 
-  @Nullable private static Map<String, LottieComposition> strongRefCache;
-  @Nullable private static Map<String, WeakReference<LottieComposition>> weakRefCache;
+  private static final Map<String, LottieComposition> strongRefCache = new HashMap<>();
+  private static final Map<String, WeakReference<LottieComposition>> weakRefCache =
+      new HashMap<>();
 
   private final LottieComposition.OnCompositionLoadedListener loadedListener =
       new LottieComposition.OnCompositionLoadedListener() {
@@ -216,14 +217,8 @@
           @Override
           public void onCompositionLoaded(LottieComposition composition) {
             if (cacheStrategy == CacheStrategy.Strong) {
-              if (strongRefCache == null) {
-                strongRefCache = new HashMap<>();
-              }
               strongRefCache.put(animationName, composition);
             } else if (cacheStrategy == CacheStrategy.Weak) {
-              if (weakRefCache == null) {
-                weakRefCache = new HashMap<>();
-              }
               weakRefCache.put(animationName, new WeakReference<>(composition));
             }