Author: robbie
Date: Fri Feb 17 11:57:45 2012
New Revision: 1245417
URL: http://svn.apache.org/viewvc?rev=1245417&view=rev
Log:
QPID-3743: remove try-catch block on converting BDB message meta data entry
into StorableMessageMetaData
Applied patch from Oleksandr Rudyy <oru...@gmail.com>
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTB_5.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTB_5.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTB_5.java?rev=1245417&r1=1245416&r2=1245417&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTB_5.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTB_5.java
Fri Feb 17 11:57:45 2012
@@ -22,7 +22,6 @@ package org.apache.qpid.server.store.ber
import com.sleepycat.bind.tuple.TupleInput;
import com.sleepycat.bind.tuple.TupleOutput;
-import org.apache.log4j.Logger;
import org.apache.qpid.server.store.MessageMetaDataType;
import org.apache.qpid.server.store.StorableMessageMetaData;
@@ -32,31 +31,21 @@ import org.apache.qpid.server.store.Stor
*/
public class MessageMetaDataTB_5 extends MessageMetaDataTB_4
{
- private static final Logger _log =
Logger.getLogger(MessageMetaDataTB_5.class);
@Override
public Object entryToObject(TupleInput tupleInput)
{
- try
- {
- final int bodySize = tupleInput.readInt();
- byte[] dataAsBytes = new byte[bodySize];
- tupleInput.readFast(dataAsBytes);
-
- java.nio.ByteBuffer buf = java.nio.ByteBuffer.wrap(dataAsBytes);
- buf.position(1);
- buf = buf.slice();
- MessageMetaDataType type =
MessageMetaDataType.values()[dataAsBytes[0]];
- StorableMessageMetaData metaData =
type.getFactory().createMetaData(buf);
-
- return metaData;
- }
- catch (Exception e)
- {
- _log.error("Error converting entry to object: " + e, e);
- // annoyingly just have to return null since we cannot throw
- return null;
- }
+ final int bodySize = tupleInput.readInt();
+ byte[] dataAsBytes = new byte[bodySize];
+ tupleInput.readFast(dataAsBytes);
+
+ java.nio.ByteBuffer buf = java.nio.ByteBuffer.wrap(dataAsBytes);
+ buf.position(1);
+ buf = buf.slice();
+ MessageMetaDataType type =
MessageMetaDataType.values()[dataAsBytes[0]];
+ StorableMessageMetaData metaData =
type.getFactory().createMetaData(buf);
+
+ return metaData;
}
@Override
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
