ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-22 14:32:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Treat IllegalStateExceptions thrown by some implementations as EOFExceptions

Browse Source
This commit is contained in:
Jeremy Lakeman 2017-08-29 16:51:14 +09:30
parent cf4306cff2
commit 34ad8c0fc0
1 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
java-api/src/org/servalproject/json/JSONTokeniser.java
View File

@ -20,6 +20,7 @@
package org.servalproject.json; package org.servalproject.json;
import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@ -31,6 +32,7 @@ public class JSONTokeniser {
final InputStream underlyingStream; final InputStream underlyingStream;
final PushbackReader reader; final PushbackReader reader;
private boolean closed = false;
Object pushedToken; Object pushedToken;
private static final boolean DUMP_JSON_TO_STDERR = false; private static final boolean DUMP_JSON_TO_STDERR = false;
@ -104,18 +106,36 @@ public class JSONTokeniser {
private int _read() throws IOException private int _read() throws IOException
{ {
try {
int n = this.reader.read(); int n = this.reader.read();
if (DUMP_JSON_TO_STDERR && n != -1) if (DUMP_JSON_TO_STDERR && n != -1)
System.err.print((char) n); System.err.print((char) n);
return n; return n;
}catch (IllegalStateException e){
if (closed) {
EOFException eof = new EOFException();
eof.initCause(e);
throw eof;
}
throw e;
}
} }
private int _read(char[] buf, int offset, int length) throws IOException private int _read(char[] buf, int offset, int length) throws IOException
{ {
try {
int n = this.reader.read(buf, offset, length); int n = this.reader.read(buf, offset, length);
if (DUMP_JSON_TO_STDERR && n != -1) if (DUMP_JSON_TO_STDERR && n != -1)
System.err.print(new String(buf, offset, n)); System.err.print(new String(buf, offset, n));
return n; return n;
}catch (IllegalStateException e){
if (closed) {
EOFException eof = new EOFException();
eof.initCause(e);
throw eof;
}
throw e;
}
} }
public static void unexpected(Object tok) throws UnexpectedTokenException public static void unexpected(Object tok) throws UnexpectedTokenException
@ -493,8 +513,9 @@ public class JSONTokeniser {
public void close() throws IOException public void close() throws IOException
{ {
this.underlyingStream.close(); closed = true;
this.reader.close(); this.reader.close();
this.underlyingStream.close();
} }
} }