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

Avoid using XmlStringBuilder.toString() #508

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Avoid using XmlStringBuilder.toString() #508

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
d44b9c6
chore: Update jitsi-xmpp-extensions.
bgrozev Oct 26, 2023
2f13144
Avoid using XmlStringBuilder.toString.
bgrozev Oct 26, 2023
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 pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jitsi-xmpp-extensions</artifactId>
<version>1.0-63-g441d6d5</version>
<version>1.0-78-g62d03d4</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/org/jitsi/jigasi/xmpp/CallControlMucActivator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import org.jitsi.utils.logging.Logger;
import org.jitsi.xmpp.extensions.rayo.*;
import org.jitsi.service.configuration.*;
import org.jitsi.xmpp.util.*;
import org.jivesoftware.smack.*;
import org.jivesoftware.smack.bosh.*;
import org.jivesoftware.smack.iqrequest.*;
Expand Down Expand Up @@ -594,14 +595,16 @@ public IQ processIQ(DialIq packet, CallContext ctx)
}
catch(SmackException.NotConnectedException | InterruptedException e)
{
logger.error(ctx + " Cannot send reply for dialIQ:" + packet.toXML());
logger.error(
ctx + " Cannot send reply for dialIQ:"
+ XmlStringBuilderUtil.toStringOpt(packet));
}
}
});
}
catch (RejectedExecutionException e)
{
logger.error(ctx + " Failed to handle incoming dialIQ:" + packet.toXML());
logger.error(ctx + " Failed to handle incoming dialIQ:" + XmlStringBuilderUtil.toStringOpt(packet));

return IQ.createErrorResponse(packet, StanzaError.getBuilder()
.setCondition(internal_server_error)
Expand All @@ -616,7 +619,7 @@ private IQ processIQInternal(DialIq packet, CallContext ctx)
{
if (logger.isDebugEnabled())
{
logger.debug(ctx + " Processing a RayoIq: " + packet.toXML());
logger.debug(ctx + " Processing a RayoIq: " + XmlStringBuilderUtil.toStringOpt(packet));
}

try
Expand Down
Loading