You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2014/02/04 04:48:16 UTC

svn commit: r1564183 - /hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java

Author: tedyu
Date: Tue Feb  4 03:48:16 2014
New Revision: 1564183

URL: http://svn.apache.org/r1564183
Log:
HBASE-10461 table.close() in TableEventHandler#reOpenAllRegions() should be enclosed in finally block


Modified:
    hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java

Modified: hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java?rev=1564183&r1=1564182&r2=1564183&view=diff
==============================================================================
--- hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java (original)
+++ hbase/branches/0.98/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/TableEventHandler.java Tue Feb  4 03:48:16 2014
@@ -172,8 +172,13 @@ public abstract class TableEventHandler 
     HTable table = new HTable(masterServices.getConfiguration(), tableName);
     TreeMap<ServerName, List<HRegionInfo>> serverToRegions = Maps
         .newTreeMap();
-    NavigableMap<HRegionInfo, ServerName> hriHserverMapping = table.getRegionLocations();
-    table.close();
+    NavigableMap<HRegionInfo, ServerName> hriHserverMapping;
+    try {
+      hriHserverMapping = table.getRegionLocations();
+    } finally {
+      table.close();
+    }
+
     List<HRegionInfo> reRegions = new ArrayList<HRegionInfo>();
     for (HRegionInfo hri : regions) {
       ServerName rsLocation = hriHserverMapping.get(hri);