Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2011-07-11 00:54:23 -0400
committerJan Bartel2011-07-11 00:54:23 -0400
commit236bd193e0edbeedb3653c18b325055ddb7fea9d (patch)
tree2ad58bdfbf57cc0060958cb43a680364ec9dcfac /jetty-deploy/src/main
parent86f7e76c4d506a556485d3ef3684d84d32f7bd4a (diff)
parentc3e3eb0fd9530c13efe5ae8e45e5f6b6e99e0dc8 (diff)
downloadorg.eclipse.jetty.project-236bd193e0edbeedb3653c18b325055ddb7fea9d.tar.gz
org.eclipse.jetty.project-236bd193e0edbeedb3653c18b325055ddb7fea9d.tar.xz
org.eclipse.jetty.project-236bd193e0edbeedb3653c18b325055ddb7fea9d.zip
Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts: VERSION.txt jetty-server/src/main/java/org/eclipse/jetty/server/SessionManager.java jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionManager.java jetty-server/src/main/java/org/eclipse/jetty/server/session/SessionHandler.java
Diffstat (limited to 'jetty-deploy/src/main')
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java
index f979243d75..a4520fabfe 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java
@@ -219,7 +219,7 @@ public class ContextDeployer extends AbstractLifeCycle
@Deprecated
public void setConfigurationDir(File file) throws Exception
{
- setConfigurationDir(Resource.newResource(file.toURL()));
+ setConfigurationDir(Resource.newResource(Resource.toURL(file)));
}
/* ------------------------------------------------------------ */

Back to the top