- final TypeDefinition<? extends Object> typedef = ((LeafSchemaNode) node).getType();
- final Codec<Object, Object> codec = RestCodec.from(typedef, mountPoint);
-
- Object decoded = codec == null ? null : codec.deserialize(urlDecoded);
+ TypeDefinition<?> typedef = ((LeafSchemaNode) node).getType();
+ final TypeDefinition<?> baseType = RestUtil.resolveBaseTypeFrom(typedef);
+ if (baseType instanceof LeafrefTypeDefinition) {
+ typedef = SchemaContextUtil.getBaseTypeForLeafRef((LeafrefTypeDefinition) baseType, globalSchema, node);
+ }
+ Codec<Object, Object> codec = RestCodec.from(typedef, mountPoint);
+ Object decoded = codec.deserialize(urlDecoded);