motiejus
/
jgit
1
Fork 0
Code Releases Activity

UploadPack: Prevent setting null protocolV2Hook 

The setProtocolV2Hook sets the protocolV2Hook to whatever value is
passed, which could be null, but the invocations of protocolV2Hook's
methods are not guarded by null-checks.

Annotate the parameter as @Nullable and set ProtocolV2Hook.DEFAULT
when null is passed. This makes the implementation consistent with
other similar methods that set a hook or filter with possible null
value.

Change-Id: I70919a3248d4c2658783941a37c47e437cff0baa
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2018-12-18 11:44:00 +09:00
parent 3d203114bd
commit fc07fa26b9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -583,10 +583,11 @@ public void setAdvertiseRefsHook(
* Set the protocol V2 hook.
*
* @param hook
* the hook; if null no special actions are taken.
* @since 5.1
*/
public void setProtocolV2Hook(ProtocolV2Hook hook) {
this.protocolV2Hook = hook;
public void setProtocolV2Hook(@Nullable ProtocolV2Hook hook) {
this.protocolV2Hook = hook != null ? hook : ProtocolV2Hook.DEFAULT;
}
/**