Skip to content

Configuration improvements for removing servers #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Configuration improvements for removing servers #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f0b58f
Method for removing all active servers from configuration
buttercookie42 Dec 1, 2024
6fc0e80
Avoid leaking servers via their configuration listener on removal
buttercookie42 Dec 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main/java/org/filesys/server/NetworkServerList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@
package org.filesys.server;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

/**
* Network Server List Class
*
* @author gkspencer
*/
public class NetworkServerList {
public class NetworkServerList implements Iterable<NetworkServer> {

// List of network servers
private List<NetworkServer> m_servers;
Expand All @@ -39,6 +40,14 @@ public NetworkServerList() {
m_servers = new ArrayList<NetworkServer>();
}

/**
* Iterator over the servers in the list
*/
@Override
public final Iterator<NetworkServer> iterator() {
return m_servers.iterator();
}

/**
* Return the number of servers in the list
*
Expand Down
18 changes: 17 additions & 1 deletion src/main/java/org/filesys/server/config/ServerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,23 @@ public final NetworkServer findServer(String proto) {
* @return NetworkServer
*/
public final NetworkServer removeServer(String proto) {
return m_serverList.removeServer(proto);
final NetworkServer server = m_serverList.removeServer(proto);
if (server instanceof ConfigurationListener) {
removeListener((ConfigurationListener) server);
}
return server;
}

/**
* Remove all active servers
*/
public final void removeAllServers() {
for (NetworkServer server : m_serverList) {
if (server instanceof ConfigurationListener) {
removeListener((ConfigurationListener) server);
}
}
m_serverList.removeAll();
}

/**
Expand Down