motiejus
/
jgit
1
Fork 0
Code Releases Activity

ReceivePack: simplify getPushOptions 

Checking if the instance allows push options before returning the
collection or null is a bit overkill. Just return the collection
or return null.

Change-Id: Icdc3755194373966e5819284aeb9bfe8dd34de82
This commit is contained in:
Shawn Pearce 2016-08-29 12:12:23 -07:00
parent 8e00a317b2
commit 2fd4559773
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
View File

@ -96,24 +96,18 @@ public ReceivePack(final Repository into) {
* Gets an unmodifiable view of the option strings associated with the push.
*
* @return an unmodifiable view of pushOptions, or null (if pushOptions is).
* @throws IllegalStateException
* if allowPushOptions has not been set to true.
* @since 4.5
*/
@Nullable
public List<String> getPushOptions() {
if (!isAllowPushOptions()) {
// Reading push options without a prior setAllowPushOptions(true)
// call doesn't make sense.
throw new IllegalStateException();
if (isAllowPushOptions() && usePushOptions) {
return Collections.unmodifiableList(pushOptions);
}
if (!usePushOptions) {
// The client doesn't support push options. Return null to
// distinguish this from the case where the client declared support
// for push options and sent an empty list of them.
return null;
}
return Collections.unmodifiableList(pushOptions);
// The client doesn't support push options. Return null to
// distinguish this from the case where the client declared support
// for push options and sent an empty list of them.
return null;
}
/**