diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotAdjunct.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotAdjunct.java
index f1be09c284b0..2ffd461ef739 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotAdjunct.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotAdjunct.java
@@ -119,8 +119,7 @@ public void testExportRetry() throws Exception {
     conf.setBoolean(ExportSnapshot.Testing.CONF_TEST_FAILURE, true);
     conf.setInt(ExportSnapshot.Testing.CONF_TEST_FAILURE_COUNT, 2);
     conf.setInt("mapreduce.map.maxattempts", 3);
-    TestExportSnapshot.testExportFileSystemState(conf, tableName,
-      Bytes.toBytes(snapshotName), Bytes.toBytes(snapshotName),
+    TestExportSnapshot.testExportFileSystemState(conf, tableName, snapshotName, snapshotName,
       tableNumFiles, TEST_UTIL.getDefaultRootDirPath(), copyDir, true,
       null, true);
   }
@@ -137,8 +136,7 @@ public void testExportFailure() throws Exception {
     conf.setBoolean(ExportSnapshot.Testing.CONF_TEST_FAILURE, true);
     conf.setInt(ExportSnapshot.Testing.CONF_TEST_FAILURE_COUNT, 4);
     conf.setInt("mapreduce.map.maxattempts", 3);
-    TestExportSnapshot.testExportFileSystemState(conf, tableName,
-      Bytes.toBytes(snapshotName), Bytes.toBytes(snapshotName),
+    TestExportSnapshot.testExportFileSystemState(conf, tableName, snapshotName, snapshotName,
       tableNumFiles, TEST_UTIL.getDefaultRootDirPath(), copyDir, true, null, false);
   }
 }
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/TBoundedThreadPoolServer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/TBoundedThreadPoolServer.java
index f9b253273c41..e8ebef58fa3f 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/TBoundedThreadPoolServer.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/TBoundedThreadPoolServer.java
@@ -290,7 +290,12 @@ public void run() {
         outputProtocol = outputProtocolFactory_.getProtocol(outputTransport);
         // we check stopped_ first to make sure we're not supposed to be shutting
         // down. this is necessary for graceful shutdown.
-        while (!stopped && processor.process(inputProtocol, outputProtocol)) {}
+        while (true) {
+          if (stopped) {
+            break;
+          }
+          processor.process(inputProtocol, outputProtocol);
+        }
       } catch (TTransportException ttx) {
         // Assume the client died and continue silently
       } catch (TException tx) {
diff --git a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
index c0678f260438..c47ed12db5f0 100644
--- a/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
+++ b/hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
@@ -533,7 +533,7 @@ public void handle(Callback[] callbacks)
         SaslServer saslServer = saslServerTransport.getSaslServer();
         String principal = saslServer.getAuthorizationID();
         hbaseServiceHandler.setEffectiveUser(principal);
-        return processor.process(inProt, outProt);
+        processor.process(inProt, outProt);
       };
     }
 
diff --git a/pom.xml b/pom.xml
index 3bee1bdb3140..33637c03c74d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1529,7 +1529,7 @@
     <external.protobuf.version>2.5.0</external.protobuf.version>
     <protobuf.plugin.version>0.6.1</protobuf.plugin.version>
     <thrift.path>thrift</thrift.path>
-    <thrift.version>0.12.0</thrift.version>
+    <thrift.version>0.13.0</thrift.version>
     <zookeeper.version>3.4.14</zookeeper.version>
     <!-- What ZooKeeper 3.4.x depends on and nothing more -->
     <jline.version>0.9.94</jline.version>