fixing #271

everit-org · Feb 2, 2019 · 13e148f · 13e148f
1 parent bad9b5a
commit 13e148f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/core/src/main/java/org/everit/json/schema/loader/ReferenceLookup.java b/core/src/main/java/org/everit/json/schema/loader/ReferenceLookup.java
@@ -91,10 +91,12 @@ Map<String, Object> withoutRef(JsonObject original) {
     }
 
     private JsonObject lookupObjById(JsonValue val, String idAttrVal) {
+        String idKeyword = val.ls.specVersion().idKeyword();
         if (val instanceof JsonObject) {
             JsonObject obj = (JsonObject) val;
-            if (obj.containsKey("$id") && obj.require("$id").requireString()
-                    .equals(idAttrVal)) {
+            if (obj.containsKey(idKeyword)
+                    && obj.require(idKeyword).typeOfValue() == String.class
+                    && obj.require(idKeyword).requireString().equals(idAttrVal)) {
                 return obj;
             }
             for (String key : obj.keySet()) {

diff --git a/...nilla/src/main/resources/org/everit/json/schema/issues/issue271/remotes/dummy-schema.json b/...nilla/src/main/resources/org/everit/json/schema/issues/issue271/remotes/dummy-schema.json
@@ -0,0 +1 @@
+{}