Reworked checkExceptions method

qvad · qvad · commit 2265a9a98925 · 2022-10-04T15:39:26.000+04:00
diff --git a/src/sqlancer/common/query/SQLQueryAdapter.java b/src/sqlancer/common/query/SQLQueryAdapter.java
@@ -98,17 +98,15 @@ public String getUnterminatedQueryString() {
     public void checkException(Exception e) throws AssertionError {
         Throwable ex = e;
 
-        while (true) {
+        while (ex != null) {
             if (expectedErrors.errorIsExpected(ex.getMessage())) {
                 return;
-            } else if (ex.getCause() != null) {
-                ex = ex.getCause();
             } else {
-                break;
+                ex = ex.getCause();
             }
         }
 
-        throw new AssertionError(query, ex);
+        throw new AssertionError(query, e);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -98,17 +98,15 @@ public String getUnterminatedQueryString() {`
`98`	`98`	`public void checkException(Exception e) throws AssertionError {`
`99`	`99`	`Throwable ex = e;`
`100`	`100`
`101`		`- while (true) {`
	`101`	`+ while (ex != null) {`
`102`	`102`	`if (expectedErrors.errorIsExpected(ex.getMessage())) {`
`103`	`103`	`return;`
`104`		`- } else if (ex.getCause() != null) {`
`105`		`- ex = ex.getCause();`
`106`	`104`	`} else {`
`107`		`- break;`
	`105`	`+ ex = ex.getCause();`
`108`	`106`	`}`
`109`	`107`	`}`
`110`	`108`
`111`		`- throw new AssertionError(query, ex);`
	`109`	`+ throw new AssertionError(query, e);`
`112`	`110`	`}`
`113`	`111`
`114`	`112`	`@Override`