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 b217a706cd7eb78de5a884aa6792715a6e0c55ca Author: Joerg Thomas <joerg.tho...@consol.de> AuthorDate: Wed Oct 30 19:13:42 2019 +0100 JAMES-2828 JDBC Mail Repository fails to save message into PostgreSQL when per recipient headers are absent --- dockerfiles/run/spring/destination/conf/sqlResources.xml | 2 +- server/app/src/main/resources/sqlResources.xml | 2 +- .../java/org/apache/james/mailrepository/jdbc/JDBCMailRepository.java | 2 +- server/data/data-jdbc/src/test/resources/sqlResources-mail.xml | 2 +- server/data/data-jdbc/src/test/resources/sqlResources.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dockerfiles/run/spring/destination/conf/sqlResources.xml b/dockerfiles/run/spring/destination/conf/sqlResources.xml index e742057..286a994 100644 --- a/dockerfiles/run/spring/destination/conf/sqlResources.xml +++ b/dockerfiles/run/spring/destination/conf/sqlResources.xml @@ -259,7 +259,7 @@ recipients text NOT NULL , remote_host varchar (255) NOT NULL , remote_addr varchar (20) NOT NULL , - per_recipient_headers oid NULL , + per_recipient_headers bytea NULL , last_updated timestamp NOT NULL, message_body bytea NOT NULL , message_attributes bytea NULL , diff --git a/server/app/src/main/resources/sqlResources.xml b/server/app/src/main/resources/sqlResources.xml index e742057..286a994 100644 --- a/server/app/src/main/resources/sqlResources.xml +++ b/server/app/src/main/resources/sqlResources.xml @@ -259,7 +259,7 @@ recipients text NOT NULL , remote_host varchar (255) NOT NULL , remote_addr varchar (20) NOT NULL , - per_recipient_headers oid NULL , + per_recipient_headers bytea NULL , last_updated timestamp NOT NULL, message_body bytea NOT NULL , message_attributes bytea NULL , 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 3ed2a29..f6a7405 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 @@ -550,7 +550,7 @@ public class JDBCMailRepository extends AbstractMailRepository { insertMessage.setString(7, mc.getRemoteHost()); insertMessage.setString(8, mc.getRemoteAddr()); if (mc.getPerRecipientSpecificHeaders().getHeadersByRecipient().isEmpty()) { - insertMessage.setNull(9, Types.BLOB); + insertMessage.setObject(9, null); } else { byte[] bytes = SerializationUtils.serialize(mc.getPerRecipientSpecificHeaders()); insertMessage.setBinaryStream(9, new ByteArrayInputStream(bytes), bytes.length); diff --git a/server/data/data-jdbc/src/test/resources/sqlResources-mail.xml b/server/data/data-jdbc/src/test/resources/sqlResources-mail.xml index 3257670..6d75e41 100644 --- a/server/data/data-jdbc/src/test/resources/sqlResources-mail.xml +++ b/server/data/data-jdbc/src/test/resources/sqlResources-mail.xml @@ -244,7 +244,7 @@ recipients text NOT NULL , remote_host varchar (255) NOT NULL , remote_addr varchar (20) NOT NULL , - per_recipient_headers oid NULL , + per_recipient_headers bytea NULL , last_updated timestamp NOT NULL, message_body bytea NOT NULL , message_attributes bytea NULL , diff --git a/server/data/data-jdbc/src/test/resources/sqlResources.xml b/server/data/data-jdbc/src/test/resources/sqlResources.xml index 9cdbd79..d426946 100644 --- a/server/data/data-jdbc/src/test/resources/sqlResources.xml +++ b/server/data/data-jdbc/src/test/resources/sqlResources.xml @@ -251,7 +251,7 @@ recipients text NOT NULL , remote_host varchar (255) NOT NULL , remote_addr varchar (20) NOT NULL , - per_recipient_headers oid NULL , + per_recipient_headers bytea NULL , last_updated timestamp NOT NULL, message_body bytea NOT NULL , message_attributes bytea NULL , --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org