diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-10-13 10:28:16 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2009-10-13 10:28:16 -0700 |
| commit | 73ecae2fdcb09d461ec8d73c7303c3e0ff033490 (patch) | |
| tree | cc93b10d70ced7fcf77b616d4a9369d0bd96b6cf /tools/sdkmanager/libs | |
| parent | 5ca98eb00860a76eef474f78b8c077c1c50f4dd1 (diff) | |
| download | android_development-73ecae2fdcb09d461ec8d73c7303c3e0ff033490.tar.gz android_development-73ecae2fdcb09d461ec8d73c7303c3e0ff033490.tar.bz2 android_development-73ecae2fdcb09d461ec8d73c7303c3e0ff033490.zip | |
Fix NPE in the parsing of property file.
this could happen if the log object is null and the parsing fails.
Change-Id: I6dbcafab26c5405efba20b30f511104fcee5bf78
Diffstat (limited to 'tools/sdkmanager/libs')
| -rw-r--r-- | tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java index 7b47f4acf..900927495 100644 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java +++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java @@ -605,8 +605,10 @@ public final class SdkManager { if (m.matches()) { map.put(m.group(1), m.group(2)); } else { - log.warning("Error parsing '%1$s': \"%2$s\" is not a valid syntax", - buildProp.getAbsolutePath(), line); + if (log != null) { + log.warning("Error parsing '%1$s': \"%2$s\" is not a valid syntax", + buildProp.getAbsolutePath(), line); + } return null; } } |