diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-13 14:41:47 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-13 14:41:47 -0400 |
| commit | 6dd9f220641ead7d3aa781cdcd0aa7e16442bc7b (patch) | |
| tree | 40cab6b1a9f85cc509499e347e5dbe9f26be9158 | |
| parent | bcd87b9d469d4025417f404eca5b568215088eef (diff) | |
| parent | 132c03da3f64994b5fcecc14b7251242d314b23e (diff) | |
| download | sdk-6dd9f220641ead7d3aa781cdcd0aa7e16442bc7b.zip sdk-6dd9f220641ead7d3aa781cdcd0aa7e16442bc7b.tar.gz sdk-6dd9f220641ead7d3aa781cdcd0aa7e16442bc7b.tar.bz2 | |
Merge change I6dbcafab into eclair
* changes:
Fix NPE in the parsing of property file.
| -rw-r--r-- | sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java index 7b47f4a..9009274 100644 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java +++ b/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; } } |