Merge pull request #65 from jenkinsci/feature/JENKINS-51521

JENKINS-51521: Default value for sortMode
jenkinsci · May 24, 2018 · 534a2fc · 534a2fc
2 parents 2369bfe + 0c75bbf
commit 534a2fc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinition.java b/src/main/java/net/uaznia/lukanus/hudson/plugins/gitparameter/GitParameterDefinition.java
@@ -202,7 +202,7 @@ public void setBranch(String nameOfBranch) {
     }
 
     public SortMode getSortMode() {
-        return this.sortMode;
+        return this.sortMode == null ? SortMode.NONE : this.sortMode;
     }
 
     public void setSortMode(SortMode sortMode) {
@@ -557,7 +557,7 @@ public ArrayList<String> sortByName(Set<String> set) {
 
         ArrayList<String> tags = new ArrayList<String>(set);
 
-        if (sortMode.getIsUsingSmartSort()) {
+        if (getSortMode().getIsUsingSmartSort()) {
             Collections.sort(tags, new SmartNumberStringComparer());
         } else {
             Collections.sort(tags);