Merged V2.2 to HEAD

7056: Ability to disable/enable CIFS/FTP/NFS via JMX Console

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8235 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-02-08 17:22:02 +00:00
parent 840b3e45be
commit 83ab25f486
6 changed files with 140 additions and 18 deletions

View File

@@ -85,7 +85,7 @@ public class FTPServerBean extends AbstractLifecycleBean
*/
public boolean isStarted()
{
return (filesysConfig != null && filesysConfig.isServerRunning("FTP"));
return (ftpServer != null && filesysConfig.isServerRunning("FTP"));
}
/**
@@ -123,7 +123,7 @@ public class FTPServerBean extends AbstractLifecycleBean
}
catch (Throwable e)
{
filesysConfig = null;
ftpServer = null;
throw new AlfrescoRuntimeException("Failed to start FTP Server", e);
}
// success
@@ -156,10 +156,6 @@ public class FTPServerBean extends AbstractLifecycleBean
getConfiguration().removeServer(ftpServer.getProtocolName());
ftpServer = null;
}
// Clear the configuration
filesysConfig = null;
}
/**
@@ -261,6 +257,9 @@ public class FTPServerBean extends AbstractLifecycleBean
protected void onShutdown(ApplicationEvent event)
{
stopServer();
// Clear the configuration
filesysConfig = null;
}
}