Fix CustomCcmRule to drop CURRENT flag no matter what

dkropachev · tolbertam · commit dfe11a8b671d · 2024-10-28T19:35:49.000-05:00
If super.after() throws an Exception `CURRENT` flag is never dropped which leads next tests to fail with IllegalStateException("Attempting to use a Ccm rule while another is in use. This is disallowed") Patch by Dmitry Kropachev; reviewed by Andy Tolbert and Bret McGuire for JAVA-3117
diff --git a/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CustomCcmRule.java b/test-infra/src/main/java/com/datastax/oss/driver/api/testinfra/ccm/CustomCcmRule.java
@@ -53,6 +53,7 @@ protected void before() {
           after();
         } catch (Exception e1) {
           LOG.warn("Error cleaning up CustomCcmRule before() failure", e1);
+          e.addSuppressed(e1);
         }
         throw e;
       }
@@ -64,8 +65,11 @@ protected void before() {
 
   @Override
   protected void after() {
-    super.after();
-    CURRENT.compareAndSet(this, null);
+    try {
+      super.after();
+    } finally {
+      CURRENT.compareAndSet(this, null);
+    }
   }
 
   public CcmBridge getCcmBridge() {

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ protected void before() {`
`53`	`53`	`after();`
`54`	`54`	`} catch (Exception e1) {`
`55`	`55`	`LOG.warn("Error cleaning up CustomCcmRule before() failure", e1);`
	`56`	`+ e.addSuppressed(e1);`
`56`	`57`	`}`
`57`	`58`	`throw e;`
`58`	`59`	`}`
`@@ -64,8 +65,11 @@ protected void before() {`
`64`	`65`
`65`	`66`	`@Override`
`66`	`67`	`protected void after() {`
`67`		`- super.after();`
`68`		`- CURRENT.compareAndSet(this, null);`
	`68`	`+ try {`
	`69`	`+ super.after();`
	`70`	`+ } finally {`
	`71`	`+ CURRENT.compareAndSet(this, null);`
	`72`	`+ }`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`public CcmBridge getCcmBridge() {`