Skip to content
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

OF-2921: Async closure partial revert #2660

Merged
merged 2 commits into from
Jan 14, 2025
Merged

OF-2921: Async closure partial revert #2660

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
fd6dd0c
OF-2921: Partial revert of b98a83d3470e06b66fbe718a304cfcf39bfba8c5
guusdk Jan 14, 2025
edf1570
Improved logging
guusdk Jan 14, 2025
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
4 changes: 1 addition & 3 deletions xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,7 @@ public synchronized void terminateDetached(LocalSession session) {
Presence presence = new Presence();
presence.setType(Presence.Type.unavailable);
presence.setFrom(session.getAddress());

// Broadcast asynchronously, to reduce the likelihood of the broadcast introducing a deadlock (OF-2921).
TaskEngine.getInstance().submit(() -> router.route(presence));
router.route(presence);
}

session.getStreamManager().onClose(router, serverAddress);
Expand Down
6 changes: 3 additions & 3 deletions xmppserver/src/main/java/org/jivesoftware/openfire/session/ClientSessionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2007-2009 Jive Software, 2021-2023 Ignite Realtime Foundation. All rights reserved.
* Copyright (C) 2007-2009 Jive Software, 2021-2025 Ignite Realtime Foundation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -38,7 +38,7 @@
*/
public class ClientSessionTask extends RemoteSessionTask {

private static Logger logger = LoggerFactory.getLogger(ClientSessionTask.class);
private static final Logger logger = LoggerFactory.getLogger(ClientSessionTask.class);

private JID address;
private transient Session session;
Expand All @@ -61,7 +61,7 @@ Session getSession() {

public void run() {
if (getSession() == null || getSession().isClosed()) {
logger.error("Session not found for JID: " + address);
logger.error("Unable to execute task for JID {}: {}", address, this, new IllegalStateException("Session not found for JID: " + address));
return;
}
super.run();
Expand Down
5 changes: 3 additions & 2 deletions xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2008 Jive Software, 2016-2024 Ignite Realtime Foundation. All rights reserved.
* Copyright (C) 2005-2008 Jive Software, 2016-2025 Ignite Realtime Foundation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -414,7 +414,8 @@ private boolean routeToLocalDomain(JID jid, Packet packet)
routed = remotePacketRouter
.routePacket(clientRoute.getNodeID().toByteArray(), jid, packet);
if (!routed) {
removeClientRoute(jid); // drop invalid client route
Log.warn("Dropping invalid client route for {}", jid);
removeClientRoute(jid);
}
}
}
Expand Down
Loading