Author: gpetracek
Date: Mon Mar 21 16:49:38 2011
New Revision: 1083864
URL: http://svn.apache.org/viewvc?rev=1083864&view=rev
Log:
OWB-548 added null check
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java?rev=1083864&r1=1083863&r2=1083864&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/corespi/se/DefaultContextsService.java
Mon Mar 21 16:49:38 2011
@@ -312,8 +312,11 @@ public class DefaultContextsService exte
private void stopApplicationContext(Object object)
{
- applicationContext.destroy();
- applicationContext = null;
+ if(applicationContext != null)
+ {
+ applicationContext.destroy();
+ applicationContext = null;
+ }
}