Revision: 1459
http://stripes.svn.sourceforge.net/stripes/?rev=1459&view=rev
Author: bengunter
Date: 2011-12-02 21:13:16 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
Applied fix for STS-810 from 1.5.x branch.
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
Modified:
trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
2011-12-02 21:12:03 UTC (rev 1458)
+++ trunk/stripes/src/net/sourceforge/stripes/controller/StripesFilter.java
2011-12-02 21:13:16 UTC (rev 1459)
@@ -100,6 +100,27 @@
* @throws ServletException thrown if a problem is encountered
initializing Stripes
*/
public void init(FilterConfig filterConfig) throws ServletException {
+ this.configuration = createConfiguration(filterConfig);
+ StripesFilter.configurations.add(new
WeakReference<Configuration>(this.configuration));
+
+ this.servletContext = filterConfig.getServletContext();
+ this.servletContext.setAttribute(StripesFilter.class.getName(), this);
+
+ Package pkg = getClass().getPackage();
+ log.info("Stripes Initialization Complete. Version: ",
pkg.getSpecificationVersion(),
+ ", Build: ", pkg.getImplementationVersion());
+ }
+
+ /**
+ * Create and configure a new {@link Configuration} instance using the
suppied
+ * {@link FilterConfig}.
+ *
+ * @param filterConfig The filter configuration supplied by the container.
+ * @return The new configuration instance.
+ * @throws ServletException If the configuration cannot be created.
+ */
+ protected static Configuration createConfiguration(FilterConfig
filterConfig)
+ throws ServletException {
BootstrapPropertyResolver bootstrap = new
BootstrapPropertyResolver(filterConfig);
// Set up the Configuration - if one isn't found by the bootstrapper
then
@@ -111,7 +132,10 @@
clazz = RuntimeConfiguration.class;
try {
- this.configuration = clazz.newInstance();
+ Configuration configuration = clazz.newInstance();
+ configuration.setBootstrapPropertyResolver(bootstrap);
+ configuration.init();
+ return configuration;
}
catch (Exception e) {
log.fatal(e,
@@ -120,17 +144,6 @@
throw new StripesServletException("Could not instantiate specified
Configuration. "
+ "Class name specified was [" + clazz.getName() + "].",
e);
}
-
- this.configuration.setBootstrapPropertyResolver(bootstrap);
- this.configuration.init();
- StripesFilter.configurations.add(new
WeakReference<Configuration>(this.configuration));
-
- this.servletContext = filterConfig.getServletContext();
- this.servletContext.setAttribute(StripesFilter.class.getName(), this);
-
- Package pkg = getClass().getPackage();
- log.info("Stripes Initialization Complete. Version: ",
pkg.getSpecificationVersion(),
- ", Build: ", pkg.getImplementationVersion());
}
/**
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
