svn commit: r1480900 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/EmptyAnnotationLiteral.java

[arne]

Author: arne
Date: Fri May 10 07:38:30 2013
New Revision: 1480900

URL: http://svn.apache.org/r1480900
Log:
OWB-802: Fixed initialization bug with CDI 1.1

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/EmptyAnnotationLiteral.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/EmptyAnnotationLiteral.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/EmptyAnnotationLiteral.java?rev=1480900&r1=1480899&r2=1480900&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/EmptyAnnotationLiteral.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/annotation/EmptyAnnotationLiteral.java
 Fri May 10 07:38:30 2013
@@ -33,7 +33,7 @@ public abstract class EmptyAnnotationLit
 
     protected EmptyAnnotationLiteral()
     {
-        this.annotationType = getAnnotationType(getClass());
+        // Leave this constructor protected, because an EmptyAnnotationLiteral 
may never directly be instantiated
     }
 
     /**
@@ -43,6 +43,10 @@ public abstract class EmptyAnnotationLit
     @Override
     public Class<? extends Annotation> annotationType()
     {
+        if (annotationType == null)
+        {
+            annotationType = getAnnotationType(getClass());
+        }
         return annotationType;
     }