Commit 13e6f655 authored by tholzheim's avatar tholzheim
Browse files

Fixed query result merging

parent ba381dd6
......@@ -15,7 +15,7 @@ apply plugin: 'maven'
apply plugin: 'com.github.johnrengelman.shadow'
group = 'org.hypergraphql'
version = '1.1.0'
version = '1.1.1'
sourceCompatibility = 1.8
targetCompatibility = 1.8
......
......@@ -181,6 +181,10 @@ public class ObjectResult extends Result<Map<String, Object>> {
@Override
public void merge(Result result) {
if(result == null){
// Nothing need to be merged
return;
}
if(this.name.equals(result.name) && result instanceof ObjectResult){
for(String entry : ((ObjectResult) result).subfields.keySet()){
if(this.subfields.containsKey(entry)){
......
......@@ -351,7 +351,7 @@ class ApplicationTest {
}
private JSONObject getConfig(String configfile) throws IOException {
String file = Files.readString(Paths.get(configfile));
String file = new String(Files.readAllBytes(Paths.get(configfile)));
final JSONObject jsonObject = new JSONObject(file);
return jsonObject;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment