Solves bug on generated code by @rootcontext annotation when used on …

…a single method.
androidannotations · Feb 15, 2019 · 2967f61 · 2967f61
1 parent deadb04
commit 2967f61
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...ations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java b/...ations/src/main/java/org/androidannotations/internal/core/handler/RootContextHandler.java
@@ -83,13 +83,13 @@ public void assignValue(JBlock targetBlock, IJAssignmentTarget fieldRef, EBeanHo
 		} else {
 			AbstractJClass extendingContextClass = getEnvironment().getJClass(typeQualifiedName);
 
-			JConditional cond = getInvocationBlock(holder)._if(holder.getContextRef()._instanceof(extendingContextClass));
-			cond._then().add(fieldRef.assign(cast(extendingContextClass, holder.getContextRef())));
+			JConditional cond = targetBlock._if(contextRef._instanceof(extendingContextClass));
+			cond._then().add(fieldRef.assign(cast(extendingContextClass, contextRef)));
 
 			JInvocation warningInvoke = getClasses().LOG.staticInvoke("w");
 			warningInvoke.arg(logTagForClassHolder(holder));
-			warningInvoke.arg(lit("Due to Context class ").plus(holder.getContextRef().invoke("getClass").invoke("getSimpleName"))
-					.plus(lit(", the @RootContext " + extendingContextClass.name() + " won't be populated")));
+			warningInvoke.arg(
+					lit("Due to Context class ").plus(contextRef.invoke("getClass").invoke("getSimpleName")).plus(lit(", the @RootContext " + extendingContextClass.name() + " won't be populated")));
 			cond._else().add(warningInvoke);
 		}
 	}