LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am bc7c3672: Merge change I6dbcafab into eclair

Browse Source 
Merge commit 'bc7c36728c353102ff8b0280b403cf348f47581e' into eclair-plus-aosp

* commit 'bc7c36728c353102ff8b0280b403cf348f47581e':
  Fix NPE in the parsing of property file.
This commit is contained in:
Xavier Ducrohet
2009-10-13 20:47:17 -07:00
committed by Android Git Automerger
parent 173e5f056c bc7c36728c
commit 1225b9c500
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
View File

@@ -605,8 +605,10 @@ public final class SdkManager {
if (m.matches()) { if (m.matches()) {
map.put(m.group(1), m.group(2)); map.put(m.group(1), m.group(2));
} else { } else {
log.warning("Error parsing '%1$s': \"%2$s\" is not a valid syntax", if (log != null) {
buildProp.getAbsolutePath(), line); log.warning("Error parsing '%1$s': \"%2$s\" is not a valid syntax",
buildProp.getAbsolutePath(), line);
}
return null; return null;
} }
} }