BaseReceive/UploadPack: Stop using deprecated RefAdvertiser.send(Map)
RefAdvertiser.send(Map<String, Ref>) is deprecated in favour of RefAdvertiser.send(Collection<Ref>). Subclasses that need to override the "send" method need to override also the deprecated version, because it is still invoked by BaseReceivePack and UploadPack. Remove the last usages of the deprecated method. Change-Id: I7eba426970251f78801ddf96b87a65d1baaebdcf Signed-off-by: Ivan Frade <ifrade@google.com>
This commit is contained in:
parent
e53b98ba2f
commit
23c3702686
|
@ -1241,7 +1241,7 @@ public void sendAdvertisedRefs(RefAdvertiser adv)
|
||||||
adv.advertiseCapability(CAPABILITY_PUSH_OPTIONS);
|
adv.advertiseCapability(CAPABILITY_PUSH_OPTIONS);
|
||||||
}
|
}
|
||||||
adv.advertiseCapability(OPTION_AGENT, UserAgent.get());
|
adv.advertiseCapability(OPTION_AGENT, UserAgent.get());
|
||||||
adv.send(getAdvertisedOrDefaultRefs());
|
adv.send(getAdvertisedOrDefaultRefs().values());
|
||||||
for (ObjectId obj : advertisedHaves)
|
for (ObjectId obj : advertisedHaves)
|
||||||
adv.advertiseHave(obj);
|
adv.advertiseHave(obj);
|
||||||
if (adv.isEmpty())
|
if (adv.isEmpty())
|
||||||
|
|
|
@ -1066,7 +1066,7 @@ private void lsRefsV2() throws IOException {
|
||||||
findSymrefs(adv, refsToSend);
|
findSymrefs(adv, refsToSend);
|
||||||
}
|
}
|
||||||
|
|
||||||
adv.send(refsToSend);
|
adv.send(refsToSend.values());
|
||||||
adv.end();
|
adv.end();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1477,7 +1477,8 @@ public void sendAdvertisedRefs(RefAdvertiser adv,
|
||||||
}
|
}
|
||||||
adv.setDerefTags(true);
|
adv.setDerefTags(true);
|
||||||
findSymrefs(adv, advertisedOrDefaultRefs);
|
findSymrefs(adv, advertisedOrDefaultRefs);
|
||||||
advertised = adv.send(advertisedOrDefaultRefs);
|
advertised = adv.send(advertisedOrDefaultRefs.values());
|
||||||
|
|
||||||
if (adv.isEmpty())
|
if (adv.isEmpty())
|
||||||
adv.advertiseId(ObjectId.zeroId(), "capabilities^{}"); //$NON-NLS-1$
|
adv.advertiseId(ObjectId.zeroId(), "capabilities^{}"); //$NON-NLS-1$
|
||||||
adv.end();
|
adv.end();
|
||||||
|
|
Loading…
Reference in New Issue