github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 22:57:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

#7022 unopened queue was throwing npe

Browse source 
Fixes #7023
This commit is contained in:
Armin Braun 2017-05-04 17:18:04 +02:00
parent 2b3d494bbe
commit 68aa662491
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
logstash-core/src/main/java/org/logstash/ackedqueue/Queue.java
View file

@ -140,7 +140,14 @@ public class Queue implements Closeable {
}
public long getPersistedByteSize() {
return headPage.getPageIO().getHead() + tailPages.stream().mapToLong((p) -> p.getPageIO().getHead()).sum();
final long size;
if (headPage == null) {
size = 0L;
} else {
size = headPage.getPageIO().getHead()
+ tailPages.stream().mapToLong(p -> p.getPageIO().getHead()).sum();
}
return size;
}
public int getPageCapacity() {

7
logstash-core/src/test/java/org/logstash/ackedqueue/QueueTest.java
View file

@ -725,4 +725,11 @@ public class QueueTest {
q.close();
}
@Test
public void getsPersistedByteSizeCorrectlyForUnopened() throws Exception {
Settings settings = TestSettings.persistedQueueSettings(100, dataPath);
try (Queue q = new Queue(settings)) {
assertThat(q.getPersistedByteSize(), is(equalTo(0L)));
}
}
}