From 990ce6385551651875f83b7b756cd32d9025566c Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Tue, 14 May 2019 17:30:05 +0300
Subject: [PATCH] DBUtils fix

Former-commit-id: e925d1c99651ae31d731edae2830e14d8adf7c63
---
 .../src/org/jkiss/dbeaver/utils/GeneralUtils.java         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/GeneralUtils.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/GeneralUtils.java
index dd40e9347b..7e044e55b7 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/GeneralUtils.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/utils/GeneralUtils.java
@@ -634,20 +634,20 @@ public class GeneralUtils {
             return null;
         }
         if (adapter.isInstance(sourceObject)) {
-            return (T) sourceObject;
+            return adapter.cast(sourceObject);
         }
 
         if (sourceObject instanceof IAdaptable) {
             IAdaptable adaptable = (IAdaptable) sourceObject;
 
-            Object result = adaptable.getAdapter(adapter);
+            T result = adaptable.getAdapter(adapter);
             if (result != null) {
                 // Sanity-check
                 if (!adapter.isInstance(result)) {
                     throw new AssertionFailedException(adaptable.getClass().getName() + ".getAdapter(" + adapter.getName() + ".class) returned " //$NON-NLS-1$//$NON-NLS-2$
                         + result.getClass().getName() + " that is not an instance the requested type"); //$NON-NLS-1$
                 }
-                return (T) result;
+                return result;
             }
         }
 
@@ -676,7 +676,7 @@ public class GeneralUtils {
         return adapt(sourceObject, adapter, true);
     }
 
-    private static Object queryAdapterManager(Object sourceObject, String adapterId, boolean allowActivation) {
+    public static Object queryAdapterManager(Object sourceObject, String adapterId, boolean allowActivation) {
         Object result;
         if (allowActivation) {
             result = AdapterManager.getDefault().loadAdapter(sourceObject, adapterId);
-- 
GitLab