This is an automated email from the ASF dual-hosted git repository.
huajianlan pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new 2bfc72e173c [fix](nereids) fix illegal import of guava's Throwables
(#45876)
2bfc72e173c is described below
commit 2bfc72e173c246ccb9ff49aab22d52c102e40508
Author: 924060929 <lanhuaj...@selectdb.com>
AuthorDate: Tue Dec 24 21:36:52 2024 +0800
[fix](nereids) fix illegal import of guava's Throwables (#45876)
fix illegal import of guava's Throwables
---
.../src/main/java/org/apache/doris/nereids/StatementContext.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/StatementContext.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/StatementContext.java
index c9f3264f8bb..da006c392e1 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/StatementContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/StatementContext.java
@@ -58,13 +58,13 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Stopwatch;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
+import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.sparkproject.guava.base.Throwables;
import java.io.Closeable;
import java.util.ArrayList;
@@ -570,7 +570,7 @@ public class StatementContext implements Closeable {
}
}
if (throwable != null) {
- Throwables.propagateIfInstanceOf(throwable,
RuntimeException.class);
+ Throwables.throwIfInstanceOf(throwable, RuntimeException.class);
throw new IllegalStateException("Release resource failed",
throwable);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
