This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 5012ee5c8a0d0aaa129fe1ae56891b1d57d61291 Author: Gary Gregory <[email protected]> AuthorDate: Fri Jun 23 22:34:55 2023 -0400 [juneau-marshall] Refactor to multi-catch --- .../src/main/java/org/apache/juneau/html/HtmlSerializerSession.java | 4 +--- .../src/main/java/org/apache/juneau/internal/Flag.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java index 00d51e176..83e5563ad 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java @@ -674,9 +674,7 @@ public class HtmlSerializerSession extends XmlSerializerSession { out.i(i+2); if (link != null) out.eTag("a"); - } catch (SerializeException e) { - throw e; - } catch (Error e) { + } catch (SerializeException | Error e) { throw e; } catch (Throwable e) { onBeanGetterException(pMeta, e); diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Flag.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Flag.java index dc061c09a..bbf9360eb 100644 --- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Flag.java +++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/Flag.java @@ -87,9 +87,7 @@ public final class Flag { private void runSnippet(Snippet snippet) { try { snippet.run(); - } catch (Error e) { - throw e; - } catch (RuntimeException e) { + } catch (Error | RuntimeException e) { throw e; } catch (Throwable e) { throw asRuntimeException(e);
