diff options
| author | Xavier Ducrohet <xav@android.com> | 2013-05-31 19:07:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-31 19:07:07 +0000 |
| commit | ac47eda797d88ec0d59f7eba668b36ba64902169 (patch) | |
| tree | aa8a33a2225deb8a75b807653fdb2ed77ea95c08 /eclipse | |
| parent | d1ead8e5a33554b917c21582922da5c0394f9e85 (diff) | |
| parent | e3781de378833e4046711057eeffffa12351b8d3 (diff) | |
| download | sdk-ac47eda797d88ec0d59f7eba668b36ba64902169.zip sdk-ac47eda797d88ec0d59f7eba668b36ba64902169.tar.gz sdk-ac47eda797d88ec0d59f7eba668b36ba64902169.tar.bz2 | |
Merge "Prevent possible NPE."
Diffstat (limited to 'eclipse')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/exportgradle/BuildFileCreator.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/exportgradle/BuildFileCreator.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/exportgradle/BuildFileCreator.java index 514e728..3b9c39d 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/exportgradle/BuildFileCreator.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/exportgradle/BuildFileCreator.java @@ -392,7 +392,9 @@ public class BuildFileCreator { */ private static IPath findCommonRoot(IPath path1, IPath path2) { // TODO: detect paths on different disk drive on Windows! - assert path1.getDevice().equals(path2.getDevice()); + if (path1 != null && path1.getDevice() != null) { + assert path1.getDevice().equals(path2.getDevice()); + } IPath result = path1.uptoSegment(0); final int count = Math.min(path1.segmentCount(), path2.segmentCount()); |