# HG changeset patch
# User jjg
# Date 1424903739 28800
# Node ID ef280223e6942bc3a500f8c24e021df79d1d1e28
# Parent  3fa94aad0264919e0b7b77a24424dab2074de556
8041628: Javadoc cross-compilation problem
Reviewed-by: jjg
Contributed-by: duboscq@ssw.jku.at

diff -r 3fa94aad0264 -r ef280223e694 langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/RootDocImpl.java
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/RootDocImpl.java	Tue Feb 24 16:11:59 2015 +0100
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/RootDocImpl.java	Wed Feb 25 14:35:39 2015 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -382,8 +382,9 @@
     }
 
     public boolean isFunctionalInterface(AnnotationDesc annotationDesc) {
-        return annotationDesc.annotationType().qualifiedName().equals(
-                env.syms.functionalInterfaceType.toString()) && env.source.allowLambda();
+        return env.source.allowLambda()
+            && annotationDesc.annotationType().qualifiedName().equals(
+                env.syms.functionalInterfaceType.toString());
     }
 
     public boolean showTagMessages() {