فهرست منبع

fix return, obj error (#1855)

Jave-Chen 5 سال پیش
والد
کامیت
16913bacd7

+ 3 - 1
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java

@@ -550,7 +550,9 @@ public class ExecutorService extends BaseService{
         }else{
             command.setCommandParam(JSONUtils.toJson(cmdParam));
             return processDao.createCommand(command);
-        }  
+        }
+
+        return 0;
     }
 
     /**

+ 9 - 6
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/DateInterval.java

@@ -35,12 +35,15 @@ public class DateInterval {
 
     @Override
     public boolean equals(Object obj) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        DateInterval that = (DateInterval) o;
-        return startTime.equals(that.startTime) &&
-                endTime.equals(that.endTime);
-        
+        if (obj == null || getClass() != obj.getClass()) {
+            return false;
+        } else if (this == obj) {
+            return true;
+        } else {
+            DateInterval that = (DateInterval) obj;
+            return startTime.equals(that.startTime) &&
+                    endTime.equals(that.endTime);
+        }
     }
 
     public Date getStartTime() {