Part of last commit

cusax-fix
Boris Grozev 13 years ago
parent 051e5175dd
commit 5558392ded

@ -369,7 +369,7 @@ public void processPacket(Packet packet)
*/
private void handleCoin(CallPeerJabberImpl callPeer, CoinIQ coinIQ)
{
setConferenceInfoXML(callPeer, -1, coinIQ.getChildElementXML());
setConferenceInfoXML(callPeer, coinIQ.getChildElementXML());
}
/**

@ -604,13 +604,6 @@ public void responseProcessed(
private class ConferenceNotifierSubscription
extends EventPackageNotifier.Subscription
{
/**
* The value of the <tt>version</tt> attribute to be specified in the
* outgoing <tt>conference-info</tt> root XML elements.
*/
private int version = 1;
/**
* Initializes a new <tt>ConferenceNotifierSubscription</tt> instance
* with a specific subscription <tt>Address</tt>/Request URI and a
@ -683,7 +676,6 @@ protected byte[] createNotifyContent(
uee);
notifyContent = conferenceInfoXML.getBytes();
}
++ version;
}
return notifyContent;
}
@ -816,14 +808,9 @@ protected void processActiveRequest(
{
if (rawContent != null)
{
int contentVersion
= setConferenceInfoXML(
setConferenceInfoXML(
callPeer,
version,
SdpUtils.getContentAsString(requestEvent.getRequest()));
if (contentVersion >= version)
version = contentVersion;
}
}

Loading…
Cancel
Save