You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by rg...@apache.org on 2009/02/23 17:36:03 UTC
svn commit: r747073 -
/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
Author: rgielen
Date: Mon Feb 23 16:36:02 2009
New Revision: 747073
URL: http://svn.apache.org/viewvc?rev=747073&view=rev
Log:
WW-2883 StrutsXmlConfigurationProvider generics fix
- applied patch submitted by Mathias Bogaert
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java?rev=747073&r1=747072&r2=747073&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java Mon Feb 23 16:36:02 2009
@@ -91,11 +91,10 @@
@Override
public void register(ContainerBuilder containerBuilder, LocatableProperties props) throws ConfigurationException {
if (servletContext != null && !containerBuilder.contains(ServletContext.class)) {
- containerBuilder.factory(ServletContext.class, new Factory() {
- public Object create(Context context) throws Exception {
+ containerBuilder.factory(ServletContext.class, new Factory<ServletContext>() {
+ public ServletContext create(Context context) throws Exception {
return servletContext;
}
-
});
}
super.register(containerBuilder, props);
@@ -148,7 +147,7 @@
}
if (file.exists()) {
try {
- url = file.toURL();
+ url = file.toURI().toURL();
} catch (MalformedURLException e) {
throw new IOException("Unable to convert "+file+" to a URL");
}
@@ -173,6 +172,4 @@
public String toString() {
return ("Struts XML configuration provider ("+filename+")");
}
-
-
}