motiejus
/
jgit
1
Fork 0
Code Releases Activity

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:
Ivan Frade 2019-03-13 21:39:51 -07:00
parent e53b98ba2f
commit 23c3702686
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit/src/org/eclipse/jgit/transport/BaseReceivePack.java
View File

@ -1241,7 +1241,7 @@ public void sendAdvertisedRefs(RefAdvertiser adv)
adv.advertiseCapability(CAPABILITY_PUSH_OPTIONS);
}
adv.advertiseCapability(OPTION_AGENT, UserAgent.get());
adv.send(getAdvertisedOrDefaultRefs());
adv.send(getAdvertisedOrDefaultRefs().values());
for (ObjectId obj : advertisedHaves)
adv.advertiseHave(obj);
if (adv.isEmpty())

5
org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java
View File

@ -1066,7 +1066,7 @@ private void lsRefsV2() throws IOException {
findSymrefs(adv, refsToSend);
}
adv.send(refsToSend);
adv.send(refsToSend.values());
adv.end();
}
@ -1477,7 +1477,8 @@ public void sendAdvertisedRefs(RefAdvertiser adv,
}
adv.setDerefTags(true);
findSymrefs(adv, advertisedOrDefaultRefs);
advertised = adv.send(advertisedOrDefaultRefs);
advertised = adv.send(advertisedOrDefaultRefs.values());
if (adv.isEmpty())
adv.advertiseId(ObjectId.zeroId(), "capabilities^{}"); //$NON-NLS-1$
adv.end();