svn commit: r1072637 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java webbeans-web/src/main/java/org/apache/webbeans/web/context/SessionContextManager.java

[struberg]

Author: struberg
Date: Sun Feb 20 17:15:31 2011
New Revision: 1072637

URL: http://svn.apache.org/viewvc?rev=1072637&view=rev
Log:
OWB-461 cleanup: fix possible NPE

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
    
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/SessionContextManager.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java?rev=1072637&r1=1072636&r2=1072637&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/intercept/InvocationContextImpl.java
 Sun Feb 20 17:15:31 2011
@@ -378,6 +378,11 @@ public class InvocationContextImpl imple
                 throw new IllegalArgumentException("Unsupportet 
InterceptorType: " + type);
             }
 
+            if (method == null)
+            {
+                throw new IllegalArgumentException("Could not find intercepted 
Method!");
+            }
+
             if (!method.isAccessible())
             {
                 SecurityUtil.doPrivilegedSetAccessible(method, true);          
      

Modified: 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/SessionContextManager.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/SessionContextManager.java?rev=1072637&r1=1072636&r2=1072637&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/SessionContextManager.java
 (original)
+++ 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/SessionContextManager.java
 Sun Feb 20 17:15:31 2011
@@ -98,9 +98,9 @@ public class SessionContextManager
             {
                 sessionContext.destroy();
             }
-        }
-        
+
         //Clear map
         sessionContexts.clear();
+        }
     }
 }