From 21a0de04ca915ff4997dc836cfcc473e6c0eda58 Mon Sep 17 00:00:00 2001 From: heavyrain2012 Date: Mon, 12 Jul 2021 16:36:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=B0=9D=E8=AF=95=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E5=8A=A0=E5=AF=86/=E6=9C=AA=E5=8A=A0=E5=AF=86?= =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=EF=BC=8C=E5=9B=A0=E4=B8=BA=E6=9C=89?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E9=94=99=E8=AF=AF=E8=A7=A3=E5=87=BA=E6=B6=88?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=B8=8D=E5=8F=AF=E6=8E=A7?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moquette/persistence/DatabaseStore.java | 33 ++----------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java index d8d25825..fef65235 100644 --- a/broker/src/main/java/io/moquette/persistence/DatabaseStore.java +++ b/broker/src/main/java/io/moquette/persistence/DatabaseStore.java @@ -684,16 +684,7 @@ public class DatabaseStore { builder.setConversation(cb.build()); Blob blob = resultSet.getBlob(index++); - WFCMessage.MessageContent messageContent; - try { - messageContent = WFCMessage.MessageContent.parseFrom(encryptMessageContent(toByteArray(blob.getBinaryStream()), false)); - } catch (InvalidProtocolBufferException e) { - if(encryptMessage) { - messageContent = WFCMessage.MessageContent.parseFrom(blob.getBinaryStream()); - } else { - messageContent = WFCMessage.MessageContent.parseFrom(encryptMessageContent(toByteArray(blob.getBinaryStream()), true)); - } - } + WFCMessage.MessageContent messageContent = WFCMessage.MessageContent.parseFrom(encryptMessageContent(toByteArray(blob.getBinaryStream()), false)); builder.setContent(messageContent); builder.setServerTimestamp(resultSet.getTimestamp(index++).getTime()); WFCMessage.Message message = builder.build(); @@ -759,16 +750,7 @@ public class DatabaseStore { builder.setConversation(cb.build()); Blob blob = resultSet.getBlob(index++); - WFCMessage.MessageContent messageContent; - try { - messageContent = WFCMessage.MessageContent.parseFrom(encryptMessageContent(toByteArray(blob.getBinaryStream()), false)); - } catch (InvalidProtocolBufferException e) { - if(encryptMessage) { - messageContent = WFCMessage.MessageContent.parseFrom(blob.getBinaryStream()); - } else { - messageContent = WFCMessage.MessageContent.parseFrom(encryptMessageContent(toByteArray(blob.getBinaryStream()), true)); - } - } + WFCMessage.MessageContent messageContent = WFCMessage.MessageContent.parseFrom(encryptMessageContent(toByteArray(blob.getBinaryStream()), false)); builder.setContent(messageContent); builder.setServerTimestamp(resultSet.getTimestamp(index++).getTime()); WFCMessage.Message message = builder.build(); @@ -873,16 +855,7 @@ public class DatabaseStore { builder.setConversation(cb.build()); Blob blob = resultSet.getBlob(index++); - WFCMessage.MessageContent messageContent; - try { - messageContent = WFCMessage.MessageContent.parseFrom(encryptMessageContent(toByteArray(blob.getBinaryStream()), false)); - } catch (InvalidProtocolBufferException e) { - if(encryptMessage) { - messageContent = WFCMessage.MessageContent.parseFrom(blob.getBinaryStream()); - } else { - messageContent = WFCMessage.MessageContent.parseFrom(encryptMessageContent(toByteArray(blob.getBinaryStream()), true)); - } - } + WFCMessage.MessageContent messageContent = WFCMessage.MessageContent.parseFrom(encryptMessageContent(toByteArray(blob.getBinaryStream()), false)); builder.setContent(messageContent);