Issue 521, avoid an NPE

[zxing.git] / android / src / com / google / zxing / client / android / LocaleManager.java

diff --git a/android/src/com/google/zxing/client/android/LocaleManager.java b/android/src/com/google/zxing/client/android/LocaleManager.java
index 92f799b..ece8174 100644 (file)
--- a/android/src/com/google/zxing/client/android/LocaleManager.java
+++ b/android/src/com/google/zxing/client/android/LocaleManager.java
@@ -22,13 +22,14 @@ import java.util.HashMap;
 
 /**
  * Handles any locale-specific logic for the client.
+ *
+ * @author Sean Owen
  */
 public final class LocaleManager {
-
   private static final String DEFAULT_TLD = "com";
   private static final Map<Locale,String> GOOGLE_COUNTRY_TLD;
   static {
-    GOOGLE_COUNTRY_TLD = new HashMap<Locale,String>(13);
+    GOOGLE_COUNTRY_TLD = new HashMap<Locale,String>();
     GOOGLE_COUNTRY_TLD.put(Locale.CANADA, "ca");
     GOOGLE_COUNTRY_TLD.put(Locale.CHINA, "cn");
     GOOGLE_COUNTRY_TLD.put(Locale.FRANCE, "fr");
@@ -43,13 +44,14 @@ public final class LocaleManager {
   // Google Product Search for mobile is available in fewer countries than web search.
   private static final Map<Locale,String> GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD;
   static {
-    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD = new HashMap<Locale,String>(3);
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD = new HashMap<Locale,String>();
     GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.UK, "co.uk");
+    GOOGLE_PRODUCT_SEARCH_COUNTRY_TLD.put(Locale.GERMANY, "de");
   }
 
   private static final Map<Locale,String> GOOGLE_BOOK_SEARCH_COUNTRY_TLD;
   static {
-    GOOGLE_BOOK_SEARCH_COUNTRY_TLD = new HashMap<Locale,String>(13);
+    GOOGLE_BOOK_SEARCH_COUNTRY_TLD = new HashMap<Locale,String>();
     GOOGLE_BOOK_SEARCH_COUNTRY_TLD.putAll(GOOGLE_COUNTRY_TLD);
     GOOGLE_BOOK_SEARCH_COUNTRY_TLD.remove(Locale.CHINA);
   }
@@ -92,5 +94,4 @@ public final class LocaleManager {
     }
     return tld;
   }
-
 }