From 339b4a6ab18a5dc7a39ca68314fb906fc1dcf6c8 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 30 May 2011 22:30:16 +0200 Subject: Whoops, we broke @Delegate with the last update. Now the CAS check on handled is only done if we are -actually- going to call a handler. --- src/core/lombok/javac/HandlerLibrary.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/core/lombok/javac') diff --git a/src/core/lombok/javac/HandlerLibrary.java b/src/core/lombok/javac/HandlerLibrary.java index 0c753c02..f0bd3442 100644 --- a/src/core/lombok/javac/HandlerLibrary.java +++ b/src/core/lombok/javac/HandlerLibrary.java @@ -170,8 +170,6 @@ public class HandlerLibrary { * @param annotation 'node.get()' - convenience parameter. */ public void handleAnnotation(JCCompilationUnit unit, JavacNode node, JCAnnotation annotation) { - if (!checkAndSetHandled(annotation)) return; - TypeResolver resolver = new TypeResolver(typeLibrary, node.getPackageDeclaration(), node.getImportStatements()); String rawType = annotation.annotationType.toString(); for (String fqn : resolver.findTypeMatches(node, rawType)) { @@ -182,9 +180,15 @@ public class HandlerLibrary { if (container == null) continue; try { - if (container.isResolutionBased() && phase == 1) container.handle(node); - if (!container.isResolutionBased() && phase == 0) container.handle(node); - if (container.annotationClass == PrintAST.class && phase == 2) container.handle(node); + if (container.isResolutionBased() && phase == 1) { + if (checkAndSetHandled(annotation)) container.handle(node); + } + if (!container.isResolutionBased() && phase == 0) { + if (checkAndSetHandled(annotation)) container.handle(node); + } + if (container.annotationClass == PrintAST.class && phase == 2) { + if (checkAndSetHandled(annotation)) container.handle(node); + } } catch (AnnotationValueDecodeFail fail) { fail.owner.setError(fail.getMessage(), fail.idx); } catch (Throwable t) { -- cgit