diff options
author | Alex Ruiz <alruiz@google.com> | 2015-08-04 04:11:58 -0700 |
---|---|---|
committer | Alex Ruiz <alruiz@google.com> | 2015-08-04 04:11:58 -0700 |
commit | df8981e4d7240e2963cfe87ce92d4b71ace57c89 (patch) | |
tree | 05600092e111faa8c8716d4ce1f8b5a51411ddeb /android | |
parent | ffcf4b0b6eb56a7f002e7d26d89d2a5415a74d75 (diff) | |
download | idea-df8981e4d7240e2963cfe87ce92d4b71ace57c89.tar.gz |
Removed checks for null that introduced bug.
Bug: 22596984
Change-Id: I0f1d3c7d3a4cbc0bcb09c8b837be44fd203a667b
Diffstat (limited to 'android')
-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() { |