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

Jump to bottom

[14.0.x] ISPN-15096 & ISPN-15097 Upgrade JGroups #11199

Merged
merged 1 commit into from
Aug 9, 2023
Merged

[14.0.x] ISPN-15096 & ISPN-15097 Upgrade JGroups #11199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 2 deletions build/configuration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@
<version.jboss.shrinkwrap.descriptors>2.0.0</version.jboss.shrinkwrap.descriptors>
<version.jboss.shrinkwrap.resolver>3.1.3</version.jboss.shrinkwrap.resolver>
<version.jcip-annotations>1.0</version.jcip-annotations>
<version.jgroups>5.2.17.Final</version.jgroups>
<version.jgroups.raft>1.0.10.Final</version.jgroups.raft>
<version.jgroups>5.2.18.Final</version.jgroups>
<version.jgroups.raft>1.0.11.Final</version.jgroups.raft>
<version.jsr107>1.1.0</version.jsr107>
<version.junit>4.13.2</version.junit>
<version.junit.platform>1.9.2</version.junit.platform>
Expand Down
10 changes: 6 additions & 4 deletions core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -998,7 +998,7 @@ public Set<String> getSitesView() {
if (relay2 == null) {
return null;
}
List<String> sites = relay2.getCurrentSites();
Collection<String> sites = relay2.getCurrentSites();
return sites == null ? Collections.emptySet() : new TreeSet<>(sites);
}

Expand Down Expand Up @@ -1545,13 +1545,15 @@ private void processRequest(org.jgroups.Address src, short flags, byte[] buffer,
log.tracef("%s received command from %s: %s", getAddress(), src, command);
reply = Reply.NO_OP;
}
if (src instanceof SiteAddress) {
if (org.jgroups.util.Util.isFlagSet(flags, Message.Flag.NO_RELAY)) {
invocationHandler.handleFromCluster(fromJGroupsAddress(src), command, reply, deliverOrder);
} else {
assert src instanceof SiteAddress;
assert command instanceof XSiteReplicateCommand;
String originSite = ((SiteAddress) src).getSite();
XSiteReplicateCommand<?> xsiteCommand = (XSiteReplicateCommand<?>) command;
xsiteCommand.setOriginSite(originSite);
invocationHandler.handleFromRemoteSite(originSite, xsiteCommand, reply, deliverOrder);
} else {
invocationHandler.handleFromCluster(fromJGroupsAddress(src), command, reply, deliverOrder);
}
} catch (Throwable t) {
CLUSTER.errorProcessingRequest(requestId, src, t);
Expand Down