From b79a8f710a6a1119bd122161dcd8df5ca032b295 Mon Sep 17 00:00:00 2001
From: serge-rider <serge.rider@gmail.com>
Date: Thu, 1 Dec 2016 12:17:14 +0300
Subject: [PATCH] Objects refresh fix

---
 .../ui/editors/entity/properties/ObjectPropertiesEditor.java  | 4 +++-
 .../src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java
index a2b52346d2..6e2a8a26e3 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/entity/properties/ObjectPropertiesEditor.java
@@ -383,7 +383,9 @@ public class ObjectPropertiesEditor extends AbstractDatabaseObjectEditor<DBSObje
 
     @Override
     public void refreshPart(Object source, boolean force) {
-        propertiesPanel.refreshPart(source, force);
+        if (propertiesPanel != null) {
+            propertiesPanel.refreshPart(source, force);
+        }
         if (folderComposite != null && folderComposite.getFolders() != null) {
             for (TabbedFolderInfo folder : folderComposite.getFolders()) {
                 if (folder.getContents() instanceof IRefreshablePart) {
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java
index 9752fb172e..5526f356f7 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/AbstractObjectCache.java
@@ -269,7 +269,9 @@ public abstract class AbstractObjectCache<OWNER extends DBSObject, OBJECT extend
                     final Object srcValue = field.get(srcObject);
                     final Object dstValue = field.get(dstObject);
                     if (DBSObjectCache.class.isAssignableFrom(field.getType())) {
-                        ((DBSObjectCache)dstValue).clearCache();
+                        if (dstValue != null) {
+                            ((DBSObjectCache) dstValue).clearCache();
+                        }
                     } else {
                         if (Modifier.isFinal(modifiers)) {
                             // Can't copy final. Let's try to make recursive copy
-- 
GitLab