Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ObjectMarshaller cannot write to stream directly - it'll get corrupted 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@508534 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2007-02-16 18:56:11 +00:00
parent 1a33eb61fb
commit c8e6ff245b
2 changed files with 30 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
activemq-core/src/main/java/org/apache/activemq/kaha/ObjectMarshaller.java
View File

@ -1,35 +1,34 @@
/** /**
* *
* Licensed to the Apache Software Foundation (ASF) under one or more * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE
* contributor license agreements. See the NOTICE file distributed with * file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file
* this work for additional information regarding copyright ownership. * to You under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the
* The ASF licenses this file to You under the Apache License, Version 2.0 * License. You may obtain a copy of the License at
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
* distributed under the License is distributed on an "AS IS" BASIS, * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * specific language governing permissions and limitations under the License.
* See the License for the specific language governing permissions and
* limitations under the License.
*/ */
package org.apache.activemq.kaha; package org.apache.activemq.kaha;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInput; import java.io.DataInput;
import java.io.DataOutput; import java.io.DataOutput;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInputStream; import java.io.ObjectInputStream;
import java.io.ObjectOutputStream; import java.io.ObjectOutputStream;
import java.io.OutputStream;
/** /**
* Implementation of a Marshaller for Objects * Implementation of a Marshaller for Objects
* *
* @version $Revision: 1.2 $ * @version $Revision: 1.2 $
*/ */
public class ObjectMarshaller implements Marshaller{ public class ObjectMarshaller implements Marshaller{
/** /**
* Write the payload of this entry to the RawContainer * Write the payload of this entry to the RawContainer
* *
@ -38,20 +37,13 @@ public class ObjectMarshaller implements Marshaller{
* @throws IOException * @throws IOException
*/ */
public void writePayload(Object object,DataOutput dataOut) throws IOException{ public void writePayload(Object object,DataOutput dataOut) throws IOException{
ByteArrayOutputStream bytesOut=new ByteArrayOutputStream();
// I failed to see why we just did not just used the provided stream directly ObjectOutputStream objectOut=new ObjectOutputStream(bytesOut);
// ByteArrayOutputStream bytesOut = new ByteArrayOutputStream();
// ObjectOutputStream objectOut=new ObjectOutputStream(bytesOut);
// objectOut.writeObject(object);
// objectOut.close();
// byte[] data = bytesOut.toByteArray();
// dataOut.writeInt(data.length);
// dataOut.write(data);
ObjectOutputStream objectOut=new ObjectOutputStream((OutputStream) dataOut);
objectOut.writeObject(object); objectOut.writeObject(object);
objectOut.flush(); objectOut.close();
objectOut.reset(); byte[] data=bytesOut.toByteArray();
dataOut.writeInt(data.length);
dataOut.write(data);
} }
/** /**
@ -62,25 +54,15 @@ public class ObjectMarshaller implements Marshaller{
* @throws IOException * @throws IOException
*/ */
public Object readPayload(DataInput dataIn) throws IOException{ public Object readPayload(DataInput dataIn) throws IOException{
int size=dataIn.readInt();
// I failed to see why we just did not just used the provided stream directly byte[] data=new byte[size];
// int size = dataIn.readInt(); dataIn.readFully(data);
// byte[] data = new byte[size]; ByteArrayInputStream bytesIn=new ByteArrayInputStream(data);
// dataIn.readFully(data); ObjectInputStream objectIn=new ObjectInputStream(bytesIn);
// ByteArrayInputStream bytesIn = new ByteArrayInputStream(data);
// ObjectInputStream objectIn=new ObjectInputStream(bytesIn);
// try{
// return objectIn.readObject();
// }catch(ClassNotFoundException e){
// throw new IOException(e.getMessage());
// }
ObjectInputStream objectIn=new ObjectInputStream((InputStream) dataIn);
try{ try{
return objectIn.readObject(); return objectIn.readObject();
} catch(ClassNotFoundException e) { }catch(ClassNotFoundException e){
throw new IOException(e.getMessage()); throw new IOException(e.getMessage());
} }
} }
} }

5
activemq-core/src/test/java/org/apache/activemq/kaha/StoreTest.java
View File

@ -151,13 +151,14 @@ public class StoreTest extends TestCase{
public void testBasicAllocations() throws Exception{ public void testBasicAllocations() throws Exception{
Map testMap = new HashMap(); Map testMap = new HashMap();
for (int i =0; i<10; i++){ int count = 1000;
for (int i =0; i<count; i++){
String key = "key:"+i; String key = "key:"+i;
String value = "value:"+i; String value = "value:"+i;
testMap.put(key, value); testMap.put(key, value);
} }
List testList = new ArrayList(); List testList = new ArrayList();
for (int i = 0; i < 10; i++){ for (int i = 0; i < count; i++){
testList.add("value:"+i); testList.add("value:"+i);
} }
String listId = "testList"; String listId = "testList";