Compare commits

..

No commits in common. "6f1f8d0d60891810594e91702403c729384e6428" and "e257b6be07cfd0ffb0182f5ffdc2f52df5d49f9c" have entirely different histories.

View File

@ -29,7 +29,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.DelayQueue; import java.util.concurrent.DelayQueue;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getInteger;
import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText; import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
/** /**
@ -82,8 +81,7 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
} }
return; return;
} }
Integer sumNum = getInteger(rootElement, "SumNum"); int num = Integer.parseInt(presetListNumElement.attributeValue("Num"));
int num = sumNum == null ? Integer.parseInt(presetListNumElement.attributeValue("Num")) : sumNum.intValue();
List<Preset> presetQuerySipReqList = new ArrayList<>(); List<Preset> presetQuerySipReqList = new ArrayList<>();
if (num > 0) { if (num > 0) {
for (Iterator<Element> presetIterator = presetListNumElement.elementIterator(); presetIterator.hasNext(); ) { for (Iterator<Element> presetIterator = presetListNumElement.elementIterator(); presetIterator.hasNext(); ) {
@ -104,7 +102,7 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
} }
} }
String sn = getText(element, "SN"); String sn = getText(element, "SN");
addCatch(cmdType + "_" + sn, num, rootElement, presetQuerySipReqList); addCatch(cmdType + "_" + sn, num, rootElement, presetQuerySipReqList);
try { try {
responseAck(request, Response.OK); responseAck(request, Response.OK);
} catch (InvalidArgumentException | ParseException | SipException e) { } catch (InvalidArgumentException | ParseException | SipException e) {