Merge pull request #1898 from bertung/master

getInitParameter also from ServletContext
Atmosphere · Mar 17, 2015 · ffc0c6e · ffc0c6e
2 parents 95e310c + 41d97a4
commit ffc0c6e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/ApplicationConfig.java b/modules/cpr/src/main/java/org/atmosphere/cpr/ApplicationConfig.java
@@ -900,5 +900,12 @@ public interface ApplicationConfig {
      * Value: org.atmosphere.cpr.AsynchronousProcessor.closeOnCancel
      */
     java.lang.String CLOSE_STREAM_ON_CANCEL = "org.atmosphere.cpr.AsynchronousProcessor.closeOnCancel";
+
+    /**
+     * Use init parameters specified for servlet context in addition to servlet config
+     * Default: false
+     * Value: org.atmosphere.cpr.AtmosphereConfig.getInitParameter
+     */
+    java.lang.String USE_SERVLET_CONTEXT_PARAMETERS = "org.atmosphere.cpr.AtmosphereConfig.getInitParameter";
 }
 
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereConfig.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereConfig.java
@@ -44,13 +44,16 @@ public class AtmosphereConfig {
     private boolean supportSession;
     private boolean sessionTimeoutRemovalAllowed;
     private boolean throwExceptionOnCloned;
+    private boolean useServletContextParameters;
     private AtmosphereFramework framework;
     private Map<String, Object> properties = new HashMap<String, Object>();
     protected List<ShutdownHook> shutdownHooks = new ArrayList<ShutdownHook>();
     protected List<StartupHook> startUpHook = new ArrayList<StartupHook>();
 
     protected AtmosphereConfig(AtmosphereFramework framework) {
         this.framework = framework;
+        String value=framework.getServletContext().getInitParameter(ApplicationConfig.USE_SERVLET_CONTEXT_PARAMETERS);
+        useServletContextParameters=value!=null && Boolean.valueOf(value);
     }
 
     public List<AtmosphereHandlerConfig> getAtmosphereHandlerConfig() {
@@ -106,11 +109,15 @@ public Map<String, AtmosphereFramework.AtmosphereHandlerWrapper> handlers() {
      * Return the value of the init params defined in web.xml or application.xml.
      *
      * @param name the name
-     * @return the list of init params defined in web.xml or application.xml
+     * @return the value for the init parameter if defined
      */
     public String getInitParameter(String name) {
         try {
-            return framework.getServletConfig().getInitParameter(name);
+        	String value=framework.getServletConfig().getInitParameter(name);
+        	if(value==null && useServletContextParameters) {
+        		value=framework.getServletContext().getInitParameter(name);
+        	}
+        	return value;
         } catch (Throwable ex) {
             // Don't fail if Tomcat crash on startup with an NPE
             return null;
@@ -120,7 +127,7 @@ public String getInitParameter(String name) {
     /**
      * Return all init param.
      *
-     * @return
+     * @return the list of init params defined in web.xml or application.xml for the servlet
      */
     public Enumeration<String> getInitParameterNames() {
         return framework().getServletConfig().getInitParameterNames();