Avoid catch Exception in Proxy codes (apache#26533)

kfirst · Jul 2, 2023 · ec6cb96 · ec6cb96
1 parent 49a3d6d
commit ec6cb96
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/...c/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java b/...c/main/java/org/apache/shardingsphere/db/protocol/mysql/codec/MySQLPacketCodecEngine.java
@@ -92,7 +92,7 @@ public void encode(final ChannelHandlerContext context, final DatabasePacket mes
         try {
             message.write(payload);
             // CHECKSTYLE:OFF
-        } catch (final Exception ex) {
+        } catch (final RuntimeException ex) {
             // CHECKSTYLE:ON
             out.resetWriterIndex();
             SQLException unknownSQLException = new UnknownSQLException(ex).toSQLException();

diff --git a/...ava/org/apache/shardingsphere/db/protocol/opengauss/codec/OpenGaussPacketCodecEngine.java b/...ava/org/apache/shardingsphere/db/protocol/opengauss/codec/OpenGaussPacketCodecEngine.java
@@ -115,7 +115,7 @@ public void encode(final ChannelHandlerContext context, final DatabasePacket mes
         try {
             message.write(payload);
             // CHECKSTYLE:OFF
-        } catch (final Exception ex) {
+        } catch (final RuntimeException ex) {
             // CHECKSTYLE:ON
             payload.getByteBuf().resetWriterIndex();
             // TODO consider what severity to use

diff --git a/...a/org/apache/shardingsphere/db/protocol/postgresql/codec/PostgreSQLPacketCodecEngine.java b/...a/org/apache/shardingsphere/db/protocol/postgresql/codec/PostgreSQLPacketCodecEngine.java
@@ -113,7 +113,7 @@ public void encode(final ChannelHandlerContext context, final DatabasePacket mes
         try {
             message.write(payload);
             // CHECKSTYLE:OFF
-        } catch (final Exception ex) {
+        } catch (final RuntimeException ex) {
             // CHECKSTYLE:ON
             payload.getByteBuf().resetWriterIndex();
             // TODO consider what severity to use

diff --git a/...he/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetCharsetExecutor.java b/...he/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetCharsetExecutor.java
@@ -61,9 +61,7 @@ private Charset parseCharset(final String value) {
             default:
                 try {
                     return Charset.forName(value);
-                    // CHECKSTYLE:OFF
-                } catch (final Exception ex) {
-                    // CHECKSTYLE:ON
+                } catch (final IllegalArgumentException ex) {
                     throw new UnknownCharsetException(value.toLowerCase());
                 }
         }