Author: dblevins
Date: Sat Oct 20 21:04:49 2012
New Revision: 1400515
URL: http://svn.apache.org/viewvc?rev=1400515&view=rev
Log:
TOMEE-491 - NullPointerException in TomEEAnnotationProvider.getAnnotatedClasses
Modified:
openejb/trunk/openejb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEAnnotationProvider.java
Modified:
openejb/trunk/openejb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEAnnotationProvider.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEAnnotationProvider.java?rev=1400515&r1=1400514&r2=1400515&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEAnnotationProvider.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-myfaces/src/main/java/org/apache/tomee/myfaces/TomEEAnnotationProvider.java
Sat Oct 20 21:04:49 2012
@@ -36,9 +36,16 @@ public class TomEEAnnotationProvider ext
@Override
public Map<Class<? extends Annotation>, Set<Class<?>>>
getAnnotatedClasses(final ExternalContext ctx) {
final ClassLoader cl = getClassLoader();
+
final WebAppBuilder builder =
SystemInstance.get().getComponent(WebAppBuilder.class);
- final Map<Class<? extends Annotation>,Set<Class<?>>> map = new
HashMap<Class<? extends Annotation>, Set<Class<?>>>();
- final Map<String, Set<String>> scanned =
builder.getJsfClasses().get(cl);
+ if (builder == null) throw new IllegalStateException("WebAppBuilder
not found in SystemInstance");
+
+ final Map<Class<? extends Annotation>, Set<Class<?>>> map = new
HashMap<Class<? extends Annotation>, Set<Class<?>>>();
+
+ final Map<ClassLoader, Map<String, Set<String>>> jsfClasses =
builder.getJsfClasses();
+ if (builder == null) throw new IllegalStateException("JsfClasses not
found in WebAppBuilder");
+
+ final Map<String, Set<String>> scanned = jsfClasses.get(cl);
if (scanned == null) {
return Collections.emptyMap();
}
