3 files changed, 3 insertions, 19 deletions
diff --git a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
index c313cf51..93b0028d 100644
--- a/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
+++ b/src/core/lombok/eclipse/handlers/EclipseHandlerUtil.java
@@ -2770,15 +2770,7 @@ public class EclipseHandlerUtil {
 	 * Returns {@code true} if the provided node supports static methods and types (top level or static class)
 	 */
 	public static boolean isStaticAllowed(EclipseNode typeNode) {
-		boolean staticAllowed = true;
-		
-		while (typeNode.getKind() != Kind.COMPILATION_UNIT) {
-			if (!staticAllowed) return false;
-			
-			staticAllowed = typeNode.isStatic();
-			typeNode = typeNode.up();
-		}
-		return true;
+		return typeNode.isStatic() || typeNode.up() == null || typeNode.up().getKind() == Kind.COMPILATION_UNIT || isRecord(typeNode);
 	}
 	
 	public static AbstractVariableDeclaration[] getRecordComponents(TypeDeclaration typeDeclaration) {
diff --git a/src/core/lombok/javac/handlers/HandleLog.java b/src/core/lombok/javac/handlers/HandleLog.java
index df3908dc..957f5581 100644
--- a/src/core/lombok/javac/handlers/HandleLog.java
+++ b/src/core/lombok/javac/handlers/HandleLog.java
@@ -80,7 +80,7 @@ public class HandleLog {
 				return;
 			}
 			
-			if (!typeNode.isEnumType() && useStatic && !isStaticAllowed(typeNode)) {
+			if (useStatic && !isStaticAllowed(typeNode)) {
 				annotationNode.addError(framework.getAnnotationAsString() + " is not supported on non-static nested classes.");
 				return;
 			}
diff --git a/src/core/lombok/javac/handlers/JavacHandlerUtil.java b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
index 53a518b4..b17e34d8 100644
--- a/src/core/lombok/javac/handlers/JavacHandlerUtil.java
+++ b/src/core/lombok/javac/handlers/JavacHandlerUtil.java
@@ -2096,15 +2096,7 @@ public class JavacHandlerUtil {
 	 * Returns {@code true} if the provided node supports static methods and types (top level or static class)
 	 */
 	public static boolean isStaticAllowed(JavacNode typeNode) {
-		boolean staticAllowed = true;
-		
-		while (typeNode.getKind() != Kind.COMPILATION_UNIT) {
-			if (!staticAllowed) return false;
-			
-			staticAllowed = typeNode.isStatic();
-			typeNode = typeNode.up();
-		}
-		return true;
+		return typeNode.isStatic() || typeNode.up() == null || typeNode.up().getKind() == Kind.COMPILATION_UNIT || isRecord(typeNode);
 	}
 	
 	public static JavacNode upToTypeNode(JavacNode node) {