Merge remote-tracking branch 'upstream/master' into reset-password-email-feature
This commit is contained in:
commit
ec1499cdf6
1 changed files with 1 additions and 1 deletions
|
@ -31,7 +31,7 @@ public class SkeletonKeyContextResolver implements ContextResolver<ObjectMapper>
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ObjectMapper getContext(Class<?> type) {
|
public ObjectMapper getContext(Class<?> type) {
|
||||||
if (type.getPackage().getName().startsWith(getClass().getPackage().getName())) return mapper;
|
if (type.getPackage() != null && type.getPackage().getName().startsWith(getClass().getPackage().getName())) return mapper;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue