[zeppelin] branch master updated: [minor] sort issue of interpreter properties

[zjffdu]

This is an automated email from the ASF dual-hosted git repository.

zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new db39f73  [minor] sort issue of interpreter properties
db39f73 is described below

commit db39f733d3ca02b73bf1f4efb125d22077511697
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Mon Mar 16 13:55:30 2020 +0800

    [minor] sort issue of interpreter properties
---
 .../zeppelin/interpreter/InterpreterSetting.java       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
index f397027..f677586 100644
--- 
a/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
+++ 
b/zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterSetting.java
@@ -596,12 +596,20 @@ public class InterpreterSetting {
         keys.sort((o1, o2) -> {
           int i1 = sortedKeys.indexOf(o1);
           int i2 = sortedKeys.indexOf(o2);
-          if (i1 < i2) {
-            return -1;
-          } else if (i1 > i2) {
-            return 1;
+          if (i1 != -1 && i2 != -1) {
+            if (i1 < i2) {
+              return -1;
+            } else if (i1 > i2) {
+              return 1;
+            } else {
+              return 0;
+            }
           } else {
-            return 0;
+            if (i1 == -1) {
+              return 1;
+            } else {
+              return -1;
+            }
           }
         });