Skip to content

Commit 9b240ac

Browse files
committed
Merge branch 'develop' of github.com:excilys/androidannotations into develop
2 parents 8058271 + a71b047 commit 9b240ac

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

  • AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing

‎AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/processing/ModelProcessor.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,13 @@ public JCodeModel process(AnnotationElements validatedModel) throws Exception {
9999
Set<AnnotatedAndRootElements> ancestorAnnotatedElements = validatedModel.getAncestorAnnotatedElements(target.getName());
100100
for (AnnotatedAndRootElements elements : ancestorAnnotatedElements) {
101101
EBeanHolder holder = eBeansHolder.getEBeanHolder(elements.rootTypeElement);
102-
processor.process(elements.annotatedElement, codeModel, holder);
102+
/*
103+
* Annotations coming from ancestors may be applied to root
104+
* elements that are not validated, and therefore not available.
105+
*/
106+
if (holder != null) {
107+
processor.process(elements.annotatedElement, codeModel, holder);
108+
}
103109
}
104110
}
105111

0 commit comments

Comments
 (0)