Skip to content

Backport Camel-15349 #4060

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

Merged
oscerd merged 1 commit into from
Jul 31, 2020
Merged

Backport Camel-15349 #4060

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
2 changes: 1 addition & 1 deletion components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ protected void doStart() throws Exception {
}

if (endpoint.getRoom() == null) {
privateChat = chatManager.chatWith(JidCreate.entityBareFrom(endpoint.getChatId()));
privateChat = chatManager.chatWith(JidCreate.entityBareFrom(endpoint.resolveParticipant(connection)));
} else {
// add the presence packet listener to the connection so we only get packets that concerns us
// we must add the listener before creating the muc
Expand Down
14 changes: 14 additions & 0 deletions components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,20 @@ private XMPPTCPConnection createConnectionInternal() throws UnknownHostException
return new XMPPTCPConnection(conf);
}

/**
* If there is no "@" symbol in the participant, find the service domain
* JID and return the fully qualified JID for the participant as user@server.domain
*/
public String resolveParticipant(XMPPConnection connection) {
String participant = getParticipant();

if (participant.indexOf('@', 0) != -1) {
return participant;
}

return participant + "@" + connection.getXMPPServiceDomain().toString();
}

/*
* If there is no "@" symbol in the room, find the chat service JID and
* return fully qualified JID for the room as room@conference.server.domain
Expand Down