You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ra...@apache.org on 2006/11/02 16:36:22 UTC
svn commit: r470391 - in
/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl:
data/ index/
Author: rajdavies
Date: Thu Nov 2 07:36:21 2006
New Revision: 470391
URL: http://svn.apache.org/viewvc?view=rev&rev=470391
Log:
moved StoreByteArray stream methods to util
Removed:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayInputStream.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreByteArrayOutputStream.java
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java?view=diff&rev=470391&r1=470390&r2=470391
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataReader.java Thu Nov 2 07:36:21 2006
@@ -21,6 +21,7 @@
import java.io.RandomAccessFile;
import org.apache.activemq.kaha.Marshaller;
import org.apache.activemq.kaha.StoreLocation;
+import org.apache.activemq.util.DataByteArrayInputStream;
/**
* Optimized Store reader
*
@@ -29,7 +30,7 @@
final class StoreDataReader{
private DataManager dataManager;
- private StoreByteArrayInputStream dataIn;
+ private DataByteArrayInputStream dataIn;
/**
* Construct a Store reader
@@ -38,7 +39,7 @@
*/
StoreDataReader(DataManager fileManager){
this.dataManager=fileManager;
- this.dataIn=new StoreByteArrayInputStream();
+ this.dataIn=new DataByteArrayInputStream();
}
/**
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java?view=diff&rev=470391&r1=470390&r2=470391
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/data/StoreDataWriter.java Thu Nov 2 07:36:21 2006
@@ -23,6 +23,7 @@
import org.apache.activemq.kaha.Marshaller;
import org.apache.activemq.kaha.StoreLocation;
+import org.apache.activemq.util.DataByteArrayOutputStream;
/**
* Optimized Store writer
*
@@ -30,7 +31,7 @@
*/
final class StoreDataWriter{
- private StoreByteArrayOutputStream buffer;
+ private DataByteArrayOutputStream buffer;
private DataManager dataManager;
@@ -41,7 +42,7 @@
*/
StoreDataWriter(DataManager fileManager){
this.dataManager=fileManager;
- this.buffer=new StoreByteArrayOutputStream();
+ this.buffer=new DataByteArrayOutputStream();
}
/**
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java?view=diff&rev=470391&r1=470390&r2=470391
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexReader.java Thu Nov 2 07:36:21 2006
@@ -20,7 +20,7 @@
import java.io.IOException;
import java.io.RandomAccessFile;
-import org.apache.activemq.kaha.impl.data.StoreByteArrayInputStream;
+import org.apache.activemq.util.DataByteArrayInputStream;
/**
* Optimized Store reader
*
@@ -28,7 +28,7 @@
*/
class StoreIndexReader{
protected RandomAccessFile file;
- protected StoreByteArrayInputStream dataIn;
+ protected DataByteArrayInputStream dataIn;
protected byte[] buffer=new byte[IndexItem.INDEX_SIZE];
/**
@@ -38,7 +38,7 @@
*/
StoreIndexReader(RandomAccessFile file){
this.file=file;
- this.dataIn=new StoreByteArrayInputStream();
+ this.dataIn=new DataByteArrayInputStream();
}
protected IndexItem readItem(long offset) throws IOException{
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java?view=diff&rev=470391&r1=470390&r2=470391
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/kaha/impl/index/StoreIndexWriter.java Thu Nov 2 07:36:21 2006
@@ -21,7 +21,7 @@
import java.io.RandomAccessFile;
import org.apache.activemq.kaha.impl.data.DataManager;
-import org.apache.activemq.kaha.impl.data.StoreByteArrayOutputStream;
+import org.apache.activemq.util.DataByteArrayOutputStream;
/**
* Optimized Store writer
*
@@ -29,7 +29,7 @@
*/
class StoreIndexWriter{
- protected final StoreByteArrayOutputStream dataOut = new StoreByteArrayOutputStream();
+ protected final DataByteArrayOutputStream dataOut = new DataByteArrayOutputStream();
protected final RandomAccessFile file;
protected final String name;
protected final DataManager redoLog;