svn commit: r1521890 - in /hive/trunk/hcatalog/core/src/main/java/org/apache: hcatalog/common/HiveClientCache.java hive/hcatalog/common/HiveClientCache.java

[hashutosh]

Author: hashutosh
Date: Wed Sep 11 14:58:50 2013
New Revision: 1521890

URL: http://svn.apache.org/r1521890
Log:
HIVE-5266 : HCatalog checkstyle failure due to HIVE5225 (Brock Noland via 
Ashutosh Chauhan)

Modified:
    
hive/trunk/hcatalog/core/src/main/java/org/apache/hcatalog/common/HiveClientCache.java
    
hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java

Modified: 
hive/trunk/hcatalog/core/src/main/java/org/apache/hcatalog/common/HiveClientCache.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/src/main/java/org/apache/hcatalog/common/HiveClientCache.java?rev=1521890&r1=1521889&r2=1521890&view=diff
==============================================================================
--- 
hive/trunk/hcatalog/core/src/main/java/org/apache/hcatalog/common/HiveClientCache.java
 (original)
+++ 
hive/trunk/hcatalog/core/src/main/java/org/apache/hcatalog/common/HiveClientCache.java
 Wed Sep 11 14:58:50 2013
@@ -27,7 +27,6 @@ import org.apache.commons.lang.builder.H
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.api.MetaException;
-import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.shims.ShimLoader;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.thrift.TException;
@@ -274,11 +273,7 @@ class HiveClientCache {
     protected boolean isOpen() {
       try {
         // Look for an unlikely database name and see if either MetaException 
or TException is thrown
-        this.getDatabase("NonExistentDatabaseUsedForHealthCheck");
-      } catch (NoSuchObjectException e) {
-        return true; // It is okay if the database doesn't exist
-      } catch (MetaException e) {
-        return false;
+        this.getDatabases("NonExistentDatabaseUsedForHealthCheck");
       } catch (TException e) {
         return false;
       }

Modified: 
hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java
URL: 
http://svn.apache.org/viewvc/hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java?rev=1521890&r1=1521889&r2=1521890&view=diff
==============================================================================
--- 
hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java
 (original)
+++ 
hive/trunk/hcatalog/core/src/main/java/org/apache/hive/hcatalog/common/HiveClientCache.java
 Wed Sep 11 14:58:50 2013
@@ -27,7 +27,6 @@ import org.apache.commons.lang.builder.H
 import org.apache.hadoop.hive.conf.HiveConf;
 import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
 import org.apache.hadoop.hive.metastore.api.MetaException;
-import org.apache.hadoop.hive.metastore.api.NoSuchObjectException;
 import org.apache.hadoop.hive.shims.ShimLoader;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.thrift.TException;