joerg/marc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix NPE in JSON writer

Browse source
This commit is contained in:
Jörg Prante 2016-09-19 11:57:35 +02:00
parent dcbe694669
commit a98816e315
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/org/xbib/marc/json/MarcJsonWriter.java
View file

@ -156,8 +156,8 @@ public class MarcJsonWriter extends MarcContentHandler implements Flushable, Clo
writer.write(sb.toString()); writer.write(sb.toString());
sb.setLength(0); sb.setLength(0);
recordCounter.incrementAndGet(); recordCounter.incrementAndGet();
} catch (IOException e) { } catch (Exception e) {
handleException(e); handleException(new IOException(e));
} finally { } finally {
lock.unlock(); lock.unlock();
} }
@ -313,7 +313,11 @@ public class MarcJsonWriter extends MarcContentHandler implements Flushable, Clo
} }
sb.append("]"); sb.append("]");
} else { } else {
sb.append("\"").append(escape(o.toString())).append("\""); if (o == null) {
sb.append("null");
} else {
sb.append("\"").append(escape(o.toString())).append("\"");
}
} }
c0++; c0++;
} }

2
src/test/java/org/xbib/marc/ConcurrencyTest.java
View file

@ -20,6 +20,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import org.junit.Test; import org.junit.Test;
import org.xbib.marc.Marc;
import org.xbib.marc.MarcXchangeConstants;
import org.xbib.marc.json.MarcJsonWriter; import org.xbib.marc.json.MarcJsonWriter;
import org.xbib.marc.xml.MarcXchangeWriter; import org.xbib.marc.xml.MarcXchangeWriter;

4
src/test/java/org/xbib/marc/MarcWriterTest.java
View file

@ -82,7 +82,7 @@ public class MarcWriterTest extends Assert {
file.deleteOnExit(); file.deleteOnExit();
FileOutputStream out = new FileOutputStream(file); FileOutputStream out = new FileOutputStream(file);
MarcValueTransformers marcValueTransformers = new MarcValueTransformers(); MarcValueTransformers marcValueTransformers = new MarcValueTransformers();
marcValueTransformers.setMarcValueTransformer("245$10$a", t -> t.replaceAll("Chabon","Chibon")); marcValueTransformers.setMarcValueTransformer("245$10$a", t -> t.replaceAll("Chabon", "Chibon"));
try (MarcWriter writer = new MarcWriter(out, StandardCharsets.UTF_8) try (MarcWriter writer = new MarcWriter(out, StandardCharsets.UTF_8)
.setMarcValueTransformers(marcValueTransformers)) { .setMarcValueTransformers(marcValueTransformers)) {
Marc.builder() Marc.builder()
@ -98,7 +98,7 @@ public class MarcWriterTest extends Assert {
xmlFile.deleteOnExit(); xmlFile.deleteOnExit();
out = new FileOutputStream(xmlFile); out = new FileOutputStream(xmlFile);
marcValueTransformers = new MarcValueTransformers(); marcValueTransformers = new MarcValueTransformers();
marcValueTransformers.setMarcValueTransformer("245$10$a", t -> t.replaceAll("Chibon","Chabon")); marcValueTransformers.setMarcValueTransformer("245$10$a", t -> t.replaceAll("Chibon", "Chabon"));
try (MarcXchangeWriter writer = new MarcXchangeWriter(out) try (MarcXchangeWriter writer = new MarcXchangeWriter(out)
.setMarcValueTransformers(marcValueTransformers)) { .setMarcValueTransformers(marcValueTransformers)) {
Marc.builder() Marc.builder()