Skip to content

Commit fc6e3c2

Browse files
committed
Fix #332
1 parent 77c3f1f commit fc6e3c2

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,7 @@ public boolean useForType(JavaType t)
261261
* you can think of it as injecting annotations between the target
262262
* class and its sub-classes (or interfaces)
263263
*/
264-
protected final HashMap<ClassKey,Class<?>> _mixInAnnotations
265-
= new HashMap<ClassKey,Class<?>>();
264+
protected final HashMap<ClassKey,Class<?>> _mixInAnnotations;
266265

267266
/*
268267
/**********************************************************
@@ -390,6 +389,7 @@ protected ObjectMapper(ObjectMapper src)
390389
_typeFactory = src._typeFactory;
391390
_serializationConfig = src._serializationConfig;
392391
HashMap<ClassKey,Class<?>> mixins = new HashMap<ClassKey,Class<?>>(src._mixInAnnotations);
392+
_mixInAnnotations = mixins;
393393
_serializationConfig = new SerializationConfig(src._serializationConfig, mixins);
394394
_deserializationConfig = new DeserializationConfig(src._deserializationConfig, mixins);
395395
_serializerProvider = src._serializerProvider;
@@ -432,11 +432,13 @@ public ObjectMapper(JsonFactory jf,
432432
_rootNames = new RootNameLookup();
433433
// and default type factory is shared one
434434
_typeFactory = TypeFactory.defaultInstance();
435-
435+
436+
HashMap<ClassKey,Class<?>> mixins = new HashMap<ClassKey,Class<?>>();
437+
_mixInAnnotations = mixins;
436438
_serializationConfig = new SerializationConfig(DEFAULT_BASE,
437-
_subtypeResolver, _mixInAnnotations);
439+
_subtypeResolver, mixins);
438440
_deserializationConfig = new DeserializationConfig(DEFAULT_BASE,
439-
_subtypeResolver, _mixInAnnotations);
441+
_subtypeResolver, mixins);
440442

441443
// Some overrides we may need
442444
final boolean needOrder = _jsonFactory.requiresPropertyOrdering();

src/main/java/com/fasterxml/jackson/databind/cfg/MapperConfigBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ public final Class<?> getActiveView() {
388388
public final ContextAttributes getAttributes() {
389389
return _attributes;
390390
}
391-
391+
392392
/*
393393
/**********************************************************
394394
/* ClassIntrospector.MixInResolver impl:

0 commit comments

Comments
 (0)