QPID-3743: remove try-catch block on converting BDB message meta data entry into StorableMessageMetaData

Applied patch from Oleksandr Rudyy <orudyy@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1245417 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 20 deletions

diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTB_5.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTB_5.java
index cb6a623038..4e124a03e3 100644
--- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTB_5.java
+++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuples/MessageMetaDataTB_5.java
@@ -22,7 +22,6 @@ package org.apache.qpid.server.store.berkeleydb.tuples;
 
 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.StorableMessageMetaData;
  */
 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);
+        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);
+        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;
-        }
+        return metaData;
     }
 
     @Override