Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Joakim Erdfelt 2017-03-10 14:05:39 -07:00
commit 3dcd318c02
1 changed files with 6 additions and 0 deletions

View File

@ -128,6 +128,12 @@ public class PropertyUserStore extends AbstractLifeCycle implements PathWatcher.
*/ */
public void setConfigPath(File configFile) public void setConfigPath(File configFile)
{ {
if(configFile == null)
{
_configPath = null;
return;
}
_configPath = configFile.toPath(); _configPath = configFile.toPath();
} }