Merge remote-tracking branch 'origin/dev-streaming_highavai' into dev-streaming_highavai

chengyitian · chengyitian · commit bbe750ee06c0 · 2024-05-09T15:42:19.000+08:00
diff --git a/test/com/xxdb/compatibility_testing/release130/streaming/ThreadPooledClientTest.java b/test/com/xxdb/compatibility_testing/release130/streaming/ThreadPooledClientTest.java
@@ -63,6 +63,7 @@ public static void login() {
 
     @Before
     public void setUp() throws IOException {
+        try{clear_env();}catch (Exception e){}
         try {
             String script0 = "login(`admin,`123456);" +
                     "try{undef(`Trades, SHARED);}catch(ex){};"+
@@ -80,7 +81,6 @@ public void setUp() throws IOException {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        clear_env();
     }
 
     @After

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ public static void login() {`
`63`	`63`
`64`	`64`	`@Before`
`65`	`65`	`public void setUp() throws IOException {`
	`66`	`+ try{clear_env();}catch (Exception e){}`
`66`	`67`	`try {`
`67`	`68`	String script0 = "login(`admin,`123456);" +
`68`	`69`	"try{undef(`Trades, SHARED);}catch(ex){};"+
`@@ -80,7 +81,6 @@ public void setUp() throws IOException {`
`80`	`81`	`} catch (IOException e) {`
`81`	`82`	`e.printStackTrace();`
`82`	`83`	`}`
`83`		`- clear_env();`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`@After`