Skip to content

Null checked for source when calling sourceRef #21431

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 10, 2016
Merged

Null checked for source when calling sourceRef #21431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddbdbb4
Null checked for source when calling sourceRef (issue #19279)
neitomic Nov 9, 2016
9e7bf16
Update pull request #21431
neitomic Nov 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions core/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ public NestedIdentity getNestedIdentity() {
*/
@Override
public BytesReference sourceRef() {
if (this.source == null) {
return null;
Copy link
Member

@javanna javanna Nov 9, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you please add the curly brackets around this statement? we tend to use them although not needed around a single, for better readability.

}

try {
this.source = CompressorFactory.uncompressIfNeeded(this.source);
return this.source;
Expand Down
11 changes: 11 additions & 0 deletions core/src/test/java/org/elasticsearch/search/internal/InternalSearchHitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,15 @@ public void testSerializeShardTarget() throws Exception {
assertThat(results.getAt(1).shard(), equalTo(target));
}

public void testNullSource() throws Exception {
InternalSearchHit searchHit = new InternalSearchHit(0, "_id", new Text("_type"), null);

assertThat(searchHit.source(), nullValue());
assertThat(searchHit.sourceRef(), nullValue());
assertThat(searchHit.sourceAsMap(), nullValue());
assertThat(searchHit.sourceAsString(), nullValue());
assertThat(searchHit.getSource(), nullValue());
assertThat(searchHit.getSourceRef(), nullValue());
assertThat(searchHit.getSourceAsString(), nullValue());
}
}