This is an automated email from the ASF dual-hosted git repository. hxd pushed a commit to branch ut_close_socket in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 2571fbfa03a97b492b3d852d91938cbb1cd901a2 Author: xiangdong huang <[email protected]> AuthorDate: Tue Feb 18 14:02:27 2020 +0800 merge with master --- .../java/org/apache/iotdb/db/utils/EnvironmentUtils.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java index f1f189b..233da32 100644 --- a/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java +++ b/server/src/test/java/org/apache/iotdb/db/utils/EnvironmentUtils.java @@ -186,20 +186,10 @@ public class EnvironmentUtils { * disable memory control</br> this function should be called before all code in the setup */ public static void envSetUp() throws StartupException { - envSetUp(daemon); - } - - /** - * disable memory control</br> this function should be called before all code in the setup - * <br> the caller should not call daemon.active(). This method will call the active() method. - */ - public static void envSetUp(IoTDB daemon) throws StartupException { System.setProperty(IoTDBConstant.REMOTE_JMX_PORT_NAME, "31999"); IoTDBDescriptor.getInstance().getConfig().setThriftServerAwaitTimeForStopService(0); if (daemon == null) { - EnvironmentUtils.daemon = new IoTDB(); - } else { - EnvironmentUtils.daemon = daemon; + daemon = new IoTDB(); } try { EnvironmentUtils.daemon.active();
