@@ -299,21 +299,21 @@ public Iterable<AnnotatedField> fields()
299
299
*/
300
300
private void resolveClassAnnotations ()
301
301
{
302
- _classAnnotations = new AnnotationMap ();
302
+ AnnotationMap ca = new AnnotationMap ();
303
303
// [JACKSON-659] Should skip processing if annotation processing disabled
304
304
if (_annotationIntrospector != null ) {
305
305
// add mix-in annotations first (overrides)
306
306
if (_primaryMixIn != null ) {
307
- _addClassMixIns (_classAnnotations , _class , _primaryMixIn );
307
+ _addClassMixIns (ca , _class , _primaryMixIn );
308
308
}
309
309
// first, annotations from the class itself:
310
- _addAnnotationsIfNotPresent (_classAnnotations , _class .getDeclaredAnnotations ());
310
+ _addAnnotationsIfNotPresent (ca , _class .getDeclaredAnnotations ());
311
311
312
312
// and then from super types
313
313
for (Class <?> cls : _superTypes ) {
314
314
// and mix mix-in annotations in-between
315
- _addClassMixIns (_classAnnotations , cls );
316
- _addAnnotationsIfNotPresent (_classAnnotations , cls .getDeclaredAnnotations ());
315
+ _addClassMixIns (ca , cls );
316
+ _addAnnotationsIfNotPresent (ca , cls .getDeclaredAnnotations ());
317
317
}
318
318
/* and finally... any annotations there might be for plain
319
319
* old Object.class: separate because for all other purposes
@@ -322,8 +322,9 @@ private void resolveClassAnnotations()
322
322
/* 12-Jul-2009, tatu: Should this be done for interfaces too?
323
323
* For now, yes, seems useful for some cases, and not harmful for any?
324
324
*/
325
- _addClassMixIns (_classAnnotations , Object .class );
325
+ _addClassMixIns (ca , Object .class );
326
326
}
327
+ _classAnnotations = ca ;
327
328
}
328
329
329
330
/**
0 commit comments