Author: rmannibucau
Date: Mon Apr 15 20:58:52 2013
New Revision: 1468226
URL: http://svn.apache.org/r1468226
Log:
avoiding NPE if extended/integrated
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java?rev=1468226&r1=1468225&r2=1468226&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/DefaultInterceptorHandler.java
Mon Apr 15 20:58:52 2013
@@ -20,6 +20,7 @@ package org.apache.webbeans.intercept;
import java.io.ObjectStreamException;
import java.lang.reflect.Method;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -106,6 +107,10 @@ public class DefaultInterceptorHandler<T
try
{
List<Interceptor<?>> methodInterceptors = interceptors.get(method);
+ if (methodInterceptors == null)
+ {
+ methodInterceptors = Collections.emptyList();
+ }
InterceptorInvocationContext<T> ctx
= new InterceptorInvocationContext<T>(delegate,
InterceptionType.AROUND_INVOKE, methodInterceptors, instances, method,
parameters);