From 7cf25fa8d4ea4bc5589d9f2dfaba342a7a122f85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Gielen?= Date: Mon, 23 Feb 2009 16:36:02 +0000 Subject: [PATCH] WW-2883 StrutsXmlConfigurationProvider generics fix - applied patch submitted by Mathias Bogaert git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@747073 13f79535-47bb-0310-9956-ffa450edef68 --- .../struts2/config/StrutsXmlConfigurationProvider.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java index 047fc0077..a1d43733a 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -91,11 +91,10 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider { @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() { + public ServletContext create(Context context) throws Exception { return servletContext; } - }); } super.register(containerBuilder, props); @@ -148,7 +147,7 @@ public class StrutsXmlConfigurationProvider extends XmlConfigurationProvider { } 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 class StrutsXmlConfigurationProvider extends XmlConfigurationProvider { public String toString() { return ("Struts XML configuration provider ("+filename+")"); } - - }