Unverified Commit 16542210 authored by easyscheduler's avatar easyscheduler Committed by GitHub
Browse files

Merge pull request #548 from boandai/dev-1.1.0 

delete nouse code
parents 7af63d67 f9d4cf46

escheduler-alert/src/main/java/cn/escheduler/alert/utils/FuncUtils.java

+3 −2
Original line number Diff line number Diff line
@@ -22,10 +22,11 @@ public class FuncUtils { 
        StringBuilder sb = new StringBuilder();

        boolean first = true;

        for (String item : list) {

            if (first)

            if (first) {

                first = false;

            else

            } else {

                sb.append(split);

            }

            sb.append(item);

        }

        return sb.toString();

escheduler-common/src/main/java/cn/escheduler/common/zk/AbstractZKClient.java

+0 −1
Original line number Diff line number Diff line
@@ -312,7 +312,6 @@ public abstract class AbstractZKClient { 
				childrenList = zkClient.getChildren().forPath(masterZNodeParentPath);

			}

		} catch (Exception e) {

//			logger.warn(e.getMessage());

			if(!e.getMessage().contains("java.lang.IllegalStateException: instance must be started")){

				logger.warn(e.getMessage(),e);

			}