You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2023/01/21 06:02:00 UTC
[james-project] branch master updated (85b7602f1d -> 5a57af88ee)
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
from 85b7602f1d [PERF] MessageResultUtils should not rely on stream
new c93ba533a3 JAMES-3875 JDBCMailRepository, cut off to long error messages
new 5a57af88ee JAMES-3875 Replace setObject with setBinaryStream to avoid type mismatch
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../james/mailrepository/jdbc/JDBCMailRepository.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 02/02: JAMES-3875 Replace setObject with setBinaryStream to avoid type mismatch
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 5a57af88eeef6bf08a115121d0a1286574663f56
Author: Adrian Bucher <e3...@e3ag.ch>
AuthorDate: Wed Jul 13 15:12:26 2022 +0200
JAMES-3875 Replace setObject with setBinaryStream to avoid type mismatch
---
.../java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
index d475cc0d9e..54b887030a 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
@@ -393,7 +393,7 @@ public class JDBCMailRepository implements MailRepository, Configurable, Initial
insertMessage.setString(7, mc.getRemoteHost());
insertMessage.setString(8, mc.getRemoteAddr());
if (mc.getPerRecipientSpecificHeaders().getHeadersByRecipient().isEmpty()) {
- insertMessage.setObject(9, null);
+ insertMessage.setBinaryStream(9, null);
} else {
byte[] bytes = SerializationUtils.serialize(mc.getPerRecipientSpecificHeaders());
insertMessage.setBinaryStream(9, new ByteArrayInputStream(bytes), bytes.length);
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org
[james-project] 01/02: JAMES-3875 JDBCMailRepository, cut off to long error messages
Posted by bt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit c93ba533a3e9819b4c0fd01199f4d94dd2485886
Author: Adrian Bucher <e3...@e3ag.ch>
AuthorDate: Tue Aug 16 14:55:03 2022 +0200
JAMES-3875 JDBCMailRepository, cut off to long error messages
---
.../apache/james/mailrepository/jdbc/JDBCMailRepository.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
index 260c716d22..d475cc0d9e 100644
--- a/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
+++ b/server/data/data-jdbc/src/main/java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java
@@ -376,7 +376,11 @@ public class JDBCMailRepository implements MailRepository, Configurable, Initial
insertMessage.setString(1, mc.getName());
insertMessage.setString(2, repositoryName);
insertMessage.setString(3, mc.getState());
- insertMessage.setString(4, mc.getErrorMessage());
+ if (mc.getErrorMessage() != null && mc.getErrorMessage().length() > 200) {
+ insertMessage.setString(4, mc.getErrorMessage().substring(0, 199));
+ } else {
+ insertMessage.setString(4, mc.getErrorMessage());
+ }
if (mc.getMaybeSender().isNullSender()) {
insertMessage.setNull(5, Types.VARCHAR);
} else {
@@ -460,7 +464,11 @@ public class JDBCMailRepository implements MailRepository, Configurable, Initial
// Update the existing record
try (PreparedStatement updateMessage = conn.prepareStatement(sqlQueries.getSqlString("updateMessageSQL", true))) {
updateMessage.setString(1, mc.getState());
- updateMessage.setString(2, mc.getErrorMessage());
+ if (mc.getErrorMessage() != null && mc.getErrorMessage().length() > 200) {
+ updateMessage.setString(2, mc.getErrorMessage().substring(0, 199));
+ } else {
+ updateMessage.setString(2, mc.getErrorMessage());
+ }
if (mc.getMaybeSender().isNullSender()) {
updateMessage.setNull(3, Types.VARCHAR);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org