Merge remote-tracking branch 'upstream/master' into reset-password-email-feature

This commit is contained in:
Michael Gerber 2015-01-02 14:11:51 +01:00
commit ec1499cdf6

View file

@ -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;
} }
} }