From 04021cc8aac9fa9883a3e0564490e93ad4ca9658 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Tue, 10 Dec 2019 16:43:57 +0300
Subject: [PATCH] Cache errors handle

Former-commit-id: 2304c20bf7dcb18d0bb4365c482e969f356792d4
---
 .../jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java | 4 ++--
 .../dbeaver/model/impl/jdbc/cache/JDBCObjectCache.java      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
index 58c6f33478..3a22b1bc91 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java
@@ -903,10 +903,10 @@ public class PostgreDatabase extends JDBCRemoteInstance<PostgreDataSource>
         }
 
         @Override
-        protected boolean handleCacheReadError(DBException error) {
+        protected boolean handleCacheReadError(Exception error) {
             // #271, #501: in some databases (AWS?) pg_authid is not accessible
             // FIXME: maybe some better workaround?
-            if (PostgreConstants.EC_PERMISSION_DENIED.equals(error.getDatabaseState())) {
+            if (error instanceof DBException && PostgreConstants.EC_PERMISSION_DENIED.equals(((DBException) error).getDatabaseState())) {
                 log.warn(error);
                 setCache(Collections.emptyList());
                 return true;
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCObjectCache.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCObjectCache.java
index afd8565101..0b5f530e94 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCObjectCache.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/cache/JDBCObjectCache.java
@@ -131,10 +131,10 @@ public abstract class JDBCObjectCache<OWNER extends DBSObject, OBJECT extends DB
                         }
                     }
                 }
-            } catch (SQLException ex) {
+            } catch (Exception ex) {
                 throw new DBException(ex, dataSource);
             }
-        } catch (DBException e) {
+        } catch (Exception e) {
             if (!handleCacheReadError(e)) {
                 throw e;
             }
@@ -157,7 +157,7 @@ public abstract class JDBCObjectCache<OWNER extends DBSObject, OBJECT extends DB
     }
 
     // Can be implemented to provide custom cache error handler
-    protected boolean handleCacheReadError(DBException error) {
+    protected boolean handleCacheReadError(Exception error) {
         return false;
     }
 
-- 
GitLab