diff options
author | Alex Ruiz <alruiz@google.com> | 2015-08-04 16:20:52 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-08-04 16:20:52 +0000 |
commit | e715ac6caad91012e1802fdc241ca40780fefe20 (patch) | |
tree | c7d4e398ddfd50b1ab97cf2ae59bbc62e26c31f9 /android/src | |
parent | 6a45bd5f067f18d44ebf07317cd51be840a4f396 (diff) | |
parent | 82178ea8c8cb42028d6be8767cdad1a496f26690 (diff) | |
download | idea-e715ac6caad91012e1802fdc241ca40780fefe20.tar.gz |
Merge "Removed checks for null that introduced bug." into studio-1.4-dev automerge: a58b9f6
automerge: 82178ea
* commit '82178ea8c8cb42028d6be8767cdad1a496f26690':
Removed checks for null that introduced bug.
Diffstat (limited to 'android/src')
-rw-r--r-- | android/src/org/jetbrains/android/facet/IdeaSourceProvider.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java b/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java index 878e3af104b..226c834413e 100644 --- a/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java +++ b/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java @@ -43,7 +43,7 @@ import static com.android.SdkConstants.ANDROID_MANIFEST_XML; * Like {@link SourceProvider}, but for IntelliJ, which means it provides * {@link VirtualFile} references rather than {@link File} references. * - * @see org.jetbrains.android.facet.AndroidSourceType + * @see AndroidSourceType */ public abstract class IdeaSourceProvider { private IdeaSourceProvider() { @@ -347,9 +347,10 @@ public abstract class IdeaSourceProvider { return Collections.singletonList(facet.getMainIdeaSourceProvider()); } AndroidModel androidModel = facet.getAndroidModel(); - assert androidModel != null; - - return createAll(androidModel.getActiveSourceProviders()); + if (androidModel != null) { + return createAll(androidModel.getActiveSourceProviders()); + } + return Collections.emptyList(); } @NotNull @@ -358,8 +359,10 @@ public abstract class IdeaSourceProvider { return Collections.emptyList(); } AndroidModel androidModel = facet.getAndroidModel(); - assert androidModel != null; - return createAll(androidModel.getTestSourceProviders()); + if (androidModel != null) { + return createAll(androidModel.getTestSourceProviders()); + } + return Collections.emptyList(); } private Collection<VirtualFile> getAllSourceFolders() { |