aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2009-10-13 10:28:16 -0700
committerXavier Ducrohet <xav@android.com>2009-10-13 10:28:16 -0700
commit132c03da3f64994b5fcecc14b7251242d314b23e (patch)
tree4e15accd48e7573bb9e2794b99441cf6fcb0793a /sdkmanager
parent4c40a82d74cc04dae7bfa03a2d2fdb51fc3f9a90 (diff)
downloadsdk-132c03da3f64994b5fcecc14b7251242d314b23e.zip
sdk-132c03da3f64994b5fcecc14b7251242d314b23e.tar.gz
sdk-132c03da3f64994b5fcecc14b7251242d314b23e.tar.bz2
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 'sdkmanager')
-rw-r--r--sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java6
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;
}
}