You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2017/05/31 15:40:38 UTC
[1/2] activemq-artemis git commit: ARTEMIS-1190 Long/int type
mismatch in JDBCSequentialFile.setWritePosition
Repository: activemq-artemis
Updated Branches:
refs/heads/1.x 2d850680d -> 0f40671a3
ARTEMIS-1190 Long/int type mismatch in JDBCSequentialFile.setWritePosition
(cherry picked from commit 69740a987d580c994a287ba533ae34d1bad407f1)
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/dc795dc5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/dc795dc5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/dc795dc5
Branch: refs/heads/1.x
Commit: dc795dc564eff29b58f4de5199168800476a9f88
Parents: 2d85068
Author: Erich Duda <ed...@redhat.com>
Authored: Tue May 30 12:34:42 2017 +0200
Committer: Erich Duda <ed...@redhat.com>
Committed: Wed May 31 07:53:01 2017 +0200
----------------------------------------------------------------------
.../activemq/artemis/jdbc/store/file/JDBCSequentialFile.java | 2 +-
.../artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dc795dc5/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
index e2da151..bb1cb61 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
@@ -77,7 +77,7 @@ public class JDBCSequentialFile implements SequentialFile {
this.dbDriver = driver;
}
- void setWritePosition(int writePosition) {
+ void setWritePosition(long writePosition) {
this.writePosition = writePosition;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/dc795dc5/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
index a901f6a..ebf3e08 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
@@ -159,7 +159,7 @@ public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
if (rs.next()) {
Blob blob = rs.getBlob(1);
if (blob != null) {
- file.setWritePosition((int) blob.length());
+ file.setWritePosition(blob.length());
} else {
logger.warn("ERROR NO BLOB FOR FILE" + "File: " + file.getFileName() + " " + file.getId());
}
[2/2] activemq-artemis git commit: This closes #1306
Posted by cl...@apache.org.
This closes #1306
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0f40671a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0f40671a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0f40671a
Branch: refs/heads/1.x
Commit: 0f40671a3da33c87b9bb3595a3d8fd2aaca96707
Parents: 2d85068 dc795dc
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed May 31 11:40:24 2017 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed May 31 11:40:24 2017 -0400
----------------------------------------------------------------------
.../activemq/artemis/jdbc/store/file/JDBCSequentialFile.java | 2 +-
.../artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------