From 32bee13a05fad35df8d2b68d6f5ce5e0e721a260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Gielen?= Date: Mon, 23 Feb 2009 16:20:19 +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@747063 13f79535-47bb-0310-9956-ffa450edef68 --- .../struts2/config/StrutsXmlConfigurationProvider.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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..fb993c327 100644 --- a/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java +++ b/core/src/main/java/org/apache/struts2/config/StrutsXmlConfigurationProvider.java @@ -91,8 +91,8 @@ 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; } @@ -148,7 +148,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"); }