svn commit: r1679535 - in /openwebbeans/trunk: webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java

[struberg]

Author: struberg
Date: Fri May 15 10:28:34 2015
New Revision: 1679535

URL: http://svn.apache.org/r1679535
Log:
OWB-1070 further improve eagerSessionInit config

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
    
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java?rev=1679535&r1=1679534&r2=1679535&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/PropertyLoader.java
 Fri May 15 10:28:34 2015
@@ -27,7 +27,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;

Modified: 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java?rev=1679535&r1=1679534&r2=1679535&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
 (original)
+++ 
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
 Fri May 15 10:28:34 2015
@@ -126,7 +126,7 @@ public class WebContextsService extends
     protected void configureEagerSessionInitialisation(WebBeansContext 
webBeansContext)
     {
         String val = 
webBeansContext.getOpenWebBeansConfiguration().getProperty(OpenWebBeansConfiguration.EAGER_SESSION_INITIALISATION);
-        if ("false".equalsIgnoreCase(val))
+        if (val == null || val.isEmpty() || "false".equalsIgnoreCase(val))
         {
             eagerSessionInitialisation = Boolean.FALSE;
             logger.fine("EagerSessionInitialisation is configured to FALSE 
(Session will get created lazily on first use)");