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

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
index cea004b515937d2a6c09ed716ce0275e8be0bff2..2e3d74a1474c1f36e4dbc1840b4f09b59356cdde 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
@@ -96,24 +96,18 @@ public class ReceivePack extends BaseReceivePack {
         * 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;
        }
 
        /**