diff options
| author |   Jean Chalard <jchalard@google.com> | 2011-07-19 18:16:34 +0900 |
|---|---|---|
| committer | Jean Chalard <jchalard@google.com> | 2011-07-19 18:19:23 +0900 |
| commit | 44861474fbea784f12fe86bc56d30d5d9be4ad81 (patch) | |
| tree | f61cd516e95f2590e9610c4ac2d0aea2ccc30359 /java/src/com/android/inputmethod/latin/DictionaryCollection.java | |
| parent | 494ab16396077f12a7c07414318f256e7ae11633 (diff) | |
| download | latinime-44861474fbea784f12fe86bc56d30d5d9be4ad81.tar.gz latinime-44861474fbea784f12fe86bc56d30d5d9be4ad81.tar.xz latinime-44861474fbea784f12fe86bc56d30d5d9be4ad81.zip | |
Add a number of NULL pointer guards.
None of these are expected to actually be null, but those are
included for peace of mind and foolproofing against future
code changes.
Bug: 4580040
Change-Id: Ib112b3e5db5f177aaf61767164b7e78d711f90a0
Diffstat (limited to 'java/src/com/android/inputmethod/latin/DictionaryCollection.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/DictionaryCollection.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/DictionaryCollection.java b/java/src/com/android/inputmethod/latin/DictionaryCollection.java index 5e7de3e6b..e987d9f0c 100644 --- a/java/src/com/android/inputmethod/latin/DictionaryCollection.java +++ b/java/src/com/android/inputmethod/latin/DictionaryCollection.java @@ -32,7 +32,11 @@ public class DictionaryCollection extends Dictionary { } public DictionaryCollection(Dictionary... dictionaries) { - mDictionaries = new CopyOnWriteArrayList<Dictionary>(dictionaries); + if (null == dictionaries) { + mDictionaries = new CopyOnWriteArrayList<Dictionary>(); + } else { + mDictionaries = new CopyOnWriteArrayList<Dictionary>(dictionaries); + } } public DictionaryCollection(Collection<Dictionary> dictionaries) { |