hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-18 15:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

DS-2952: Only prepend new line if we have an actual input stream

Browse Source
This commit is contained in:
Tom Desair
2016-12-30 00:43:53 +01:00
parent df1f81bf9d
commit c50c3006dd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dspace-api/src/main/java/org/dspace/discovery/FullTextContentStreams.java
View File

@@ -189,9 +189,9 @@ public class FullTextContentStreams extends ContentStreamBase
} }
public InputStream nextElement() { public InputStream nextElement() {
InputStream inputStream; InputStream inputStream = null;
FullTextBitstream bitstream = null; FullTextBitstream bitstream = null;
try { try {
bitstream = fulltextIterator.next(); bitstream = fulltextIterator.next();
inputStream = bitstream.getInputStream(); inputStream = bitstream.getInputStream();
@@ -203,7 +203,8 @@ public class FullTextContentStreams extends ContentStreamBase
inputStream = new ByteArrayInputStream((e.getClass() + ": " + e.getMessage()).getBytes(StandardCharsets.UTF_8)); inputStream = new ByteArrayInputStream((e.getClass() + ": " + e.getMessage()).getBytes(StandardCharsets.UTF_8));
} }
return new SequenceInputStream(new ByteArrayInputStream("\n".getBytes(Charsets.UTF_8)), inputStream); return inputStream == null ? null : new SequenceInputStream(
new ByteArrayInputStream("\n".getBytes(Charsets.UTF_8)), inputStream);
} }
} }