Skip to content

Commit 5fde304

Browse files
m7stockeleftherias
authored andcommitted
Resolve JavaType only once for whitelisted class
1 parent 9d26f12 commit 5fde304

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2015-2018 the original author or authors.
2+
* Copyright 2015-2019 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -225,7 +225,7 @@ public JavaType typeFromId(DatabindContext context, String id) throws IOExceptio
225225
JavaType result = delegate.typeFromId(context, id);
226226
String className = result.getRawClass().getName();
227227
if (isWhitelisted(className)) {
228-
return delegate.typeFromId(context, id);
228+
return result;
229229
}
230230
boolean isExplicitMixin = config.findMixInClassFor(result.getRawClass()) != null;
231231
if (isExplicitMixin) {

0 commit comments

Comments
 (0)