github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: DataReader was read twice in exception-path (#1314)

Browse Source
This commit is contained in:
Roland Praml
2018-03-02 12:15:01 +13:00
committed by Rob Bygrave
parent 83b463040f
commit 0e1c815826
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonList.java
+3 -2
View File
@@ -70,11 +70,12 @@ public class ScalarTypeJsonList {
@Override
public List read(DataReader dataReader) throws SQLException {
String json = dataReader.getString();
try {
// parse JSON into modifyAware list
return EJson.parseList(dataReader.getString(), true);
return EJson.parseList(json, true);
} catch (IOException e) {
throw new SQLException("Failed to parse JSON content as List: [" + dataReader.getString() + "]", e);
throw new SQLException("Failed to parse JSON content as List: [" + json + "]", e);
}
}
src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonSet.java
+3 -2
View File
@@ -73,11 +73,12 @@ public class ScalarTypeJsonSet {
@Override
public Set read(DataReader dataReader) throws SQLException {
String json = dataReader.getString();
try {
// parse JSON into modifyAware list
return EJson.parseSet(dataReader.getString(), true);
return EJson.parseSet(json, true);
} catch (IOException e) {
throw new SQLException("Failed to parse JSON content as List: [" + dataReader.getString() + "]", e);
throw new SQLException("Failed to parse JSON content as List: [" + json + "]", e);
}
}