You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/09/16 13:13:53 UTC
[shardingsphere] branch master updated: Refactor
PostgreSQLErrPacketFactory (#7492)
This is an automated email from the ASF dual-hosted git repository.
zhangyonglun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 0b4f31a Refactor PostgreSQLErrPacketFactory (#7492)
0b4f31a is described below
commit 0b4f31ae39ef092d421084bd8833de20cdcc1c9e
Author: Liang Zhang <te...@163.com>
AuthorDate: Wed Sep 16 21:13:34 2020 +0800
Refactor PostgreSQLErrPacketFactory (#7492)
* Code format for PostgreSQLErrPacketFactory
* Refactor PostgreSQLErrPacketFactory
* Refactor PostgreSQLErrPacketFactory
---
.../postgresql/PostgreSQLErrPacketFactory.java | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLErrPacketFactory.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLErrPacketFactory.java
index 5599363..283fe53 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLErrPacketFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLErrPacketFactory.java
@@ -37,22 +37,22 @@ public final class PostgreSQLErrPacketFactory {
*/
public static PostgreSQLErrorResponsePacket newInstance(final Exception cause) {
if (cause instanceof PSQLException) {
+ PostgreSQLErrorResponsePacket result = new PostgreSQLErrorResponsePacket();
ServerErrorMessage serverErrorMessage = ((PSQLException) cause).getServerErrorMessage();
- PostgreSQLErrorResponsePacket errorResponsePacket = new PostgreSQLErrorResponsePacket();
- if (null != serverErrorMessage) {
- errorResponsePacket.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_SEVERITY, serverErrorMessage.getSeverity());
- errorResponsePacket.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_CODE, serverErrorMessage.getSQLState());
- errorResponsePacket.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_MESSAGE, serverErrorMessage.getMessage());
- errorResponsePacket.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_POSITION, Integer.toString(serverErrorMessage.getPosition()));
- } else {
+ if (null == serverErrorMessage) {
PSQLException ex = (PSQLException) cause;
- errorResponsePacket.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_CODE, ex.getSQLState());
- errorResponsePacket.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_MESSAGE, ex.getMessage());
+ result.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_CODE, ex.getSQLState());
+ result.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_MESSAGE, ex.getMessage());
+ } else {
+ result.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_SEVERITY, serverErrorMessage.getSeverity());
+ result.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_CODE, serverErrorMessage.getSQLState());
+ result.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_MESSAGE, serverErrorMessage.getMessage());
+ result.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_POSITION, Integer.toString(serverErrorMessage.getPosition()));
}
- return errorResponsePacket;
+ return result;
}
- PostgreSQLErrorResponsePacket errorResponsePacket = new PostgreSQLErrorResponsePacket();
- errorResponsePacket.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_MESSAGE, cause.getMessage());
- return errorResponsePacket;
+ PostgreSQLErrorResponsePacket result = new PostgreSQLErrorResponsePacket();
+ result.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_MESSAGE, cause.getMessage());
+ return result;
}
}