Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<slf4j.version>1.7.36</slf4j.version>
<junit.version>5.8.2</junit.version>
<smack.version>4.4.8-jitsi-1</smack.version>
<smack.version>4.4.8-jitsi-3</smack.version>
<jxmppVersion>1.0.3</jxmppVersion>
<!-- Match jicoco's jetty version. -->
<jicoco.version>1.1-157-gb20b38c</jicoco.version>
<jicoco.version>1.1-158-g9fcf1b7</jicoco.version>
<jetty.version>11.0.21</jetty.version>
<oci-sdk.version>3.45.0</oci-sdk.version>
</properties>
Expand Down Expand Up @@ -357,7 +357,7 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>jitsi-xmpp-extensions</artifactId>
<version>1.0-93-ge089d84</version>
<version>1.0-94-g29b94fa</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/jitsi/jigasi/xmpp/CallControlMucActivator.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public class CallControlMucActivator
private CallControl callControl = null;

private ConfigurationService configService;

/**
* The thread pool to serve all call control operations.
*/
Expand All @@ -88,7 +88,7 @@ public CallControlMucActivator()
{
super(ConfigurationService.class);
}

/**
* Starts muc control component. Finds all xmpp accounts and listen for
* new ones registered.
Expand Down Expand Up @@ -597,14 +597,14 @@ public IQ processIQ(DialIq packet, CallContext ctx)
{
logger.error(
ctx + " Cannot send reply for dialIQ:"
+ XmlStringBuilderUtil.toStringOpt(packet));
+ packet.toXML());
}
}
});
}
catch (RejectedExecutionException e)
{
logger.error(ctx + " Failed to handle incoming dialIQ:" + XmlStringBuilderUtil.toStringOpt(packet));
logger.error(ctx + " Failed to handle incoming dialIQ:" + packet.toXML());

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

try
Expand Down