[jboss-cvs] JBoss Messaging SVN: r5108 - in branches/Branch_Chunk_Clebert: src/main/org/jboss/messaging/core/client/impl and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 13 21:16:00 EDT 2008
Author: clebert.suconic at jboss.com
Date: 2008-10-13 21:16:00 -0400 (Mon, 13 Oct 2008)
New Revision: 5108
Added:
branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/client/impl/FileClientMessageImpl.java
branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/integration/chunkmessage/
branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
Removed:
branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/chunkmessage/
Modified:
branches/Branch_Chunk_Clebert/.classpath
branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/SequentialFile.java
branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java
branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalFile.java
branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalFileImpl.java
branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java
branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalServerLargeMessageImpl.java
branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/ReclaimerTest.java
branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
Log:
Partial commit
Modified: branches/Branch_Chunk_Clebert/.classpath
===================================================================
--- branches/Branch_Chunk_Clebert/.classpath 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/.classpath 2008-10-14 01:16:00 UTC (rev 5108)
@@ -6,7 +6,11 @@
<classpathentry kind="src" path="src/config"/>
<classpathentry kind="src" path="examples/jms/src"/>
<classpathentry kind="src" path="examples/messaging/src"/>
- <classpathentry excluding="**/.svn/**/*" kind="src" path="tests/src"/>
+ <classpathentry excluding="**/.svn/**/*" kind="src" path="tests/src">
+ <attributes>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="/work/projects/trunk/native/bin"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="src" path="tests/jms-tests/src"/>
<classpathentry kind="lib" path="thirdparty/oswego-concurrent/lib/concurrent.jar"/>
<classpathentry kind="lib" path="thirdparty/jgroups/lib/jgroups.jar"/>
Modified: branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java
===================================================================
--- branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/client/impl/ClientProducerImpl.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -332,7 +332,7 @@
if (msg.getEncodeSize() > BIG_PACKAGE_SIZE)
{
- sendMessageInChunks(msg);
+ sendMessageInChunks(sendBlocking, msg);
}
else
@@ -376,7 +376,7 @@
* @param msg
* @throws MessagingException
*/
- private void sendMessageInChunks(final ClientMessage msg) throws MessagingException
+ private void sendMessageInChunks(final boolean sendBlocking, final ClientMessage msg) throws MessagingException
{
int headerSize = msg.getPropertiesEncodeSize();
@@ -414,7 +414,14 @@
chunk = new SessionSendChunkMessage(id, null, bodyBuffer.array(), pos + bodyLength < bodySize, true);
- channel.sendBlocking(chunk);
+ if (sendBlocking)
+ {
+ channel.sendBlocking(chunk);
+ }
+ else
+ {
+ channel.send(chunk);
+ }
pos += bodyLength;
}
Added: branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/client/impl/FileClientMessageImpl.java
===================================================================
--- branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/client/impl/FileClientMessageImpl.java (rev 0)
+++ branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/client/impl/FileClientMessageImpl.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+
+package org.jboss.messaging.core.client.impl;
+
+/**
+ * A FileClientMessageImpl
+ *
+ * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ *
+ * Created Oct 13, 2008 4:33:56 PM
+ *
+ *
+ */
+public class FileClientMessageImpl extends ClientMessageImpl
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Modified: branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/SequentialFile.java
===================================================================
--- branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/SequentialFile.java 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/SequentialFile.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -68,9 +68,9 @@
int read(ByteBuffer bytes) throws Exception;
- void position(int pos) throws Exception;
+ void position(long pos) throws Exception;
- int position() throws Exception;
+ long position() throws Exception;
void close() throws Exception;
Modified: branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java
===================================================================
--- branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/AIOSequentialFile.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -194,14 +194,14 @@
aioFile.setBufferCallback(callback);
}
- public void position(final int pos) throws Exception
+ public void position(final long pos) throws Exception
{
position.set(pos);
}
- public int position() throws Exception
+ public long position() throws Exception
{
- return (int)position.get();
+ return position.get();
}
public int read(final ByteBuffer bytes, final IOCallback callback) throws Exception
Modified: branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalFile.java
===================================================================
--- branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalFile.java 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalFile.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -51,11 +51,11 @@
void extendOffset(final int delta);
- int getOffset();
+ long getOffset();
int getOrderingID();
- void setOffset(final int offset);
+ void setOffset(final long offset);
SequentialFile getFile();
}
Modified: branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalFileImpl.java
===================================================================
--- branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalFileImpl.java 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/JournalFileImpl.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -46,7 +46,7 @@
private final int orderingID;
- private int offset;
+ private long offset;
private final AtomicInteger posCount = new AtomicInteger(0);
@@ -110,7 +110,7 @@
offset += delta;
}
- public int getOffset()
+ public long getOffset()
{
return offset;
}
@@ -120,7 +120,7 @@
return orderingID;
}
- public void setOffset(final int offset)
+ public void setOffset(final long offset)
{
this.offset = offset;
}
Modified: branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java
===================================================================
--- branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/journal/impl/NIOSequentialFile.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -223,14 +223,14 @@
return channel.size();
}
- public void position(final int pos) throws Exception
+ public void position(final long pos) throws Exception
{
channel.position(pos);
}
- public int position() throws Exception
+ public long position() throws Exception
{
- return (int)channel.position();
+ return channel.position();
}
public String toString()
Modified: branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalServerLargeMessageImpl.java
===================================================================
--- branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalServerLargeMessageImpl.java 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalServerLargeMessageImpl.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -47,8 +47,6 @@
final SequentialFile file;
- ByteBuffer headersBuffer;
-
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
@@ -64,19 +62,21 @@
/* (non-Javadoc)
* @see org.jboss.messaging.core.server.ServerLargeMessage#addBytes(byte[])
*/
- public void addBytes(final byte[] bytes) throws Exception
+ public synchronized void addBytes(final byte[] bytes) throws Exception
{
if (!file.isOpen())
{
file.open();
}
+
+ file.position(file.size());
file.write(ByteBuffer.wrap(bytes), false);
}
@Override
- public void encodeBody(MessagingBuffer bufferOut, int start, int size)
+ public synchronized void encodeBody(MessagingBuffer bufferOut, int start, int size)
{
try
{
@@ -109,7 +109,7 @@
}
@Override
- public int getBodySize()
+ public synchronized int getBodySize()
{
try
{
@@ -128,13 +128,13 @@
}
@Override
- public int getMemoryEstimate()
+ public synchronized int getMemoryEstimate()
{
// The body won't be on memory (aways on-file), so we don't consider this for paging
return super.getPropertiesEncodeSize();
}
- public void releaseResources() throws Exception
+ public synchronized void releaseResources() throws Exception
{
if (file.isOpen())
{
Modified: branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
===================================================================
--- branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -324,7 +324,7 @@
* @param message
* @throws MessagingException
*/
- private void sendChunks(ServerLargeMessage message) throws MessagingException
+ private void sendChunks(ServerLargeMessage message) throws Exception
{
int headerSize = message.getPropertiesEncodeSize();
@@ -358,6 +358,8 @@
pos += bodyLength;
}
+
+ message.releaseResources();
}
private void promptDelivery()
Copied: branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/integration/chunkmessage (from rev 5100, branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/chunkmessage)
Property changes on: branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/integration/chunkmessage
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java
===================================================================
--- branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/chunkmessage/MessageChunkTest.java 2008-10-10 14:29:11 UTC (rev 5100)
+++ branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -1,133 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.messaging.tests.unit.core.chunkmessage;
-
-import java.nio.ByteBuffer;
-
-import org.jboss.messaging.core.client.ClientConsumer;
-import org.jboss.messaging.core.client.ClientMessage;
-import org.jboss.messaging.core.client.ClientProducer;
-import org.jboss.messaging.core.client.ClientSession;
-import org.jboss.messaging.core.client.ClientSessionFactory;
-import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
-import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
-import org.jboss.messaging.tests.util.ServiceTestBase;
-import org.jboss.messaging.util.DataConstants;
-import org.jboss.messaging.util.SimpleString;
-
-/**
- * A TestMessageChunk
- *
- * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- *
- * Created 29-Sep-08 4:04:10 PM
- *
- *
- */
-public class MessageChunkTest extends ServiceTestBase
-{
-
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- private static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- public void testMessageChunk() throws Exception
- {
- ClientSessionFactory sf = createInVMFactory();
-
- ClientSession session = sf.createSession(false, true, true, false);
-
- session.createQueue(ADDRESS, ADDRESS, null, true, false);
-
- ClientProducer producer = session.createProducer(ADDRESS);
-
- MessagingBuffer body = new ByteBufferWrapper(ByteBuffer.allocate(DataConstants.SIZE_INT * 150000));
-
- for (int i = 0; i < 15000; i++)
- {
- body.putInt(i);
- }
- body.flip();
-
- ClientMessage message = session.createClientMessage(true);
-
- message.setBody(body);
- producer.send(message);
-
- session.close();
-
- if (this.realFiles)
- {
- messagingService.stop();
-
- messagingService = createService(realFiles);
- messagingService.start();
-
- sf = createInVMFactory();
- }
-
- session = sf.createSession(false, true, true, false);
-
- ClientConsumer consumer = session.createConsumer(ADDRESS);
-
- session.start();
-
- ClientMessage message2 = consumer.receive(5000);
-
- assertNotNull(message2);
-
- System.out.println("msg on client = " + message2.getMessageID());
-
- assertEqualsByteArrays(body.limit(), body.array(), message2.getBody().array());
-
- session.close();
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- protected void setUp() throws Exception
- {
- this.realFiles = false;
- super.setUp();
- }
-
- protected void tearDown() throws Exception
- {
- super.tearDown();
- }
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
-}
Copied: branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java (from rev 5103, branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/chunkmessage/MessageChunkTest.java)
===================================================================
--- branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java (rev 0)
+++ branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/integration/chunkmessage/MessageChunkTest.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -0,0 +1,166 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.messaging.tests.integration.chunkmessage;
+
+import java.nio.ByteBuffer;
+
+import org.jboss.messaging.core.client.ClientConsumer;
+import org.jboss.messaging.core.client.ClientMessage;
+import org.jboss.messaging.core.client.ClientProducer;
+import org.jboss.messaging.core.client.ClientSession;
+import org.jboss.messaging.core.client.ClientSessionFactory;
+import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
+import org.jboss.messaging.core.remoting.spi.MessagingBuffer;
+import org.jboss.messaging.tests.util.ServiceTestBase;
+import org.jboss.messaging.util.DataConstants;
+import org.jboss.messaging.util.SimpleString;
+
+/**
+ * A TestMessageChunk
+ *
+ * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
+ *
+ * Created 29-Sep-08 4:04:10 PM
+ *
+ *
+ */
+public class MessageChunkTest extends ServiceTestBase
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public void testMessageChunk() throws Exception
+ {
+ ClientSessionFactory sf = createInVMFactory();
+
+ ClientSession session = sf.createSession(false, true, true, false);
+
+ session.createQueue(ADDRESS, ADDRESS, null, true, false);
+
+ ClientProducer producer = session.createProducer(ADDRESS);
+
+ MessagingBuffer body = new ByteBufferWrapper(ByteBuffer.allocate(DataConstants.SIZE_INT * 150000));
+
+ for (int i = 0; i < 15000; i++)
+ {
+ body.putInt(i);
+ }
+ body.flip();
+
+ //printBuffer("body to be sent : " , body);
+
+ ClientMessage message = session.createClientMessage(true);
+
+ message.setBody(body);
+ producer.send(message);
+
+ session.close();
+
+ if (this.realFiles)
+ {
+ messagingService.stop();
+
+ messagingService = createService(realFiles);
+ messagingService.start();
+
+ sf = createInVMFactory();
+ }
+
+ session = sf.createSession(false, true, true, false);
+
+ ClientConsumer consumer = session.createConsumer(ADDRESS);
+
+ session.start();
+
+ ClientMessage message2 = consumer.receive(5000);
+
+ assertNotNull(message2);
+
+ System.out.println("msg on client = " + message2.getMessageID());
+
+ //printBuffer("message received : ", message2.getBody());
+
+ assertEqualsByteArrays(body.limit(), body.array(), message2.getBody().array());
+
+ session.close();
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ protected void setUp() throws Exception
+ {
+ this.realFiles = true;
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception
+ {
+ super.tearDown();
+ }
+
+
+ // Private -------------------------------------------------------
+
+ public static void printBuffer(String msg, MessagingBuffer buffer)
+ {
+
+ buffer.rewind();
+
+ int size = buffer.limit();
+
+ System.out.print(msg);
+
+
+ for (int i = 0; i < size; i ++)
+ {
+ System.out.print(String.format("%1$X", buffer.getByte()));
+ if (i % 40 != 0 || i == 0)
+ {
+ System.out.print(", ");
+ }
+ else
+ {
+ System.out.println();
+ System.out.print(msg);
+ }
+ }
+ buffer.rewind();
+
+
+ }
+
+ // Inner classes -------------------------------------------------
+
+}
Modified: branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/ReclaimerTest.java
===================================================================
--- branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/ReclaimerTest.java 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/ReclaimerTest.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -757,7 +757,7 @@
return null;
}
- public int getOffset()
+ public long getOffset()
{
return 0;
}
@@ -767,7 +767,7 @@
return 0;
}
- public void setOffset(final int offset)
+ public void setOffset(final long offset)
{
}
Modified: branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java
===================================================================
--- branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2008-10-13 16:54:15 UTC (rev 5107)
+++ branches/Branch_Chunk_Clebert/tests/src/org/jboss/messaging/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2008-10-14 01:16:00 UTC (rev 5108)
@@ -406,7 +406,7 @@
return bytesRead.length;
}
- public void position(final int pos) throws Exception
+ public void position(final long pos) throws Exception
{
if (!open)
{
@@ -415,10 +415,10 @@
checkAlignment(pos);
- data.position(pos);
+ data.position((int)pos);
}
- public int position() throws Exception
+ public long position() throws Exception
{
return data.position();
}
@@ -520,7 +520,7 @@
return "FakeSequentialFile:" + fileName;
}
- private void checkAlignment(final int position)
+ private void checkAlignment(final long position)
{
if (position % alignment != 0)
{
More information about the jboss-cvs-commits
mailing list