You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by rc...@apache.org on 2023/02/07 09:25:01 UTC
[james-project] branch 3.7.x updated (8c44bdcf7e -> 9d618dc253)
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a change to branch 3.7.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
from 8c44bdcf7e [maven-release-plugin] prepare for next development iteration
new 966579582f JAMES-3875 JDBCMailRepository, cut off to long error messages
new 9d618dc253 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] 01/02: JAMES-3875 JDBCMailRepository, cut off to long error messages
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch 3.7.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 966579582fa233a6cf21db4dd2fe579d7884a7d4
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 2acd881156..1aeb2338d7 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
@@ -422,7 +422,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 {
@@ -510,7 +514,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
[james-project] 02/02: JAMES-3875 Replace setObject with setBinaryStream to avoid type mismatch
Posted by rc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch 3.7.x
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 9d618dc253e04c60e2a761d727383d0ed4ad91a1
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 1aeb2338d7..2ed44318a2 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
@@ -443,7 +443,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