tomee-commits mailing list archives

Author: andygumbrecht
Date: Tue Aug  9 11:53:08 2011
New Revision: 1155323

URL: http://svn.apache.org/viewvc?rev=1155323&view=rev
Log:
Fix null pointer on destroyConversationContext and destroyRequestContext

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java?rev=1155323&r1=1155322&r2=1155323&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
(original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
Tue Aug  9 11:53:08 2011
@@ -91,8 +91,11 @@ public class CdiAppContextsService exten
         requestContext.remove();
         sessionContext.set(null);
         sessionContext.remove();
-        conversationContext.set(null);
-        conversationContext.remove();
+
+        if (null != conversationContext) {
+            conversationContext.set(null);
+            conversationContext.remove();
+        }
 
     }
 
@@ -235,8 +238,10 @@ public class CdiAppContextsService exten
 //        singletonContext.remove();
 
         //Conversation context
-        conversationContext.set(null);
-        conversationContext.remove();
+        if (null != conversationContext) {
+            conversationContext.set(null);
+            conversationContext.remove();
+        }
     }
 
     /**
@@ -338,8 +343,10 @@ public class CdiAppContextsService exten
             context.destroy();
         }
 
-        conversationContext.set(null);
-        conversationContext.remove();
+        if (null != conversationContext) {
+            conversationContext.set(null);
+            conversationContext.remove();
+        }
     }