From 20e0f2b62508f066204c178ccc88aa676b9933a1 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Thu, 18 Jul 2013 18:37:53 +0000
Subject: [PATCH] HBASE-8987 ProtobufUtil.toException doesn't handle plain
 RemoteException, gets a NoSuchMethodException

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1504591 13f79535-47bb-0310-9956-ffa450edef68
---
 .../hadoop/hbase/protobuf/ProtobufUtil.java       | 15 ++++++++++-----
 .../hadoop/hbase/protobuf/TestProtobufUtil.java   | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
index 619dcd6039b..f4fff80d3c1 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
@@ -1204,17 +1204,22 @@ public final class ProtobufUtil {
    * @throws IOException if failed to deserialize the parameter
    */
   @SuppressWarnings("unchecked")
-  public static Throwable toException(
-      final NameBytesPair parameter) throws IOException {
+  public static Throwable toException(final NameBytesPair parameter) throws IOException {
     if (parameter == null || !parameter.hasValue()) return null;
     String desc = parameter.getValue().toStringUtf8();
     String type = parameter.getName();
     try {
       Class<? extends Throwable> c =
         (Class<? extends Throwable>)Class.forName(type, true, CLASS_LOADER);
-      Constructor<? extends Throwable> cn =
-        c.getDeclaredConstructor(String.class);
-      return cn.newInstance(desc);
+      Constructor<? extends Throwable> cn = null;
+      try {
+        cn = c.getDeclaredConstructor(String.class);
+        return cn.newInstance(desc);
+      } catch (NoSuchMethodException e) {
+        // Could be a raw RemoteException. See HBASE-8987.
+        cn = c.getDeclaredConstructor(String.class, String.class);
+        return cn.newInstance(type, desc);
+      }
     } catch (Exception e) {
       throw new IOException(e);
     }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java
index a686ba25974..6237f64a393 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java
@@ -36,6 +36,7 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.Col
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.ColumnValue.QualifierValue;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.DeleteType;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType;
+import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -47,6 +48,20 @@ import com.google.protobuf.ByteString;
  */
 @Category(SmallTests.class)
 public class TestProtobufUtil {
+  @Test
+  public void testException() throws IOException {
+    NameBytesPair.Builder builder = NameBytesPair.newBuilder();
+    final String omg = "OMG!!!";
+    builder.setName("java.io.IOException");
+    builder.setValue(ByteString.copyFrom(Bytes.toBytes(omg)));
+    Throwable t = ProtobufUtil.toException(builder.build());
+    assertEquals(omg, t.getMessage());
+    builder.clear();
+    builder.setName("org.apache.hadoop.ipc.RemoteException");
+    builder.setValue(ByteString.copyFrom(Bytes.toBytes(omg)));
+    t = ProtobufUtil.toException(builder.build());
+    assertEquals(omg, t.getMessage());
+  }
 
   /**
    * Test basic Get conversions.