From 0c144d225bfb15886e1d6260889c0ebd5cc579f0 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Fri, 8 Apr 2016 01:09:34 +0300
Subject: [PATCH] #348 Create new object: check owner object type

---
 .../jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java | 7 ++++++-
 .../src/org/jkiss/dbeaver/utils/GeneralUtils.java          | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
index a19f6a472f..79ec0dca30 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/sql/edit/SQLObjectEditor.java
@@ -75,7 +75,12 @@ public abstract class SQLObjectEditor<OBJECT_TYPE extends DBSObject, CONTAINER_T
     @Override
     public final OBJECT_TYPE createNewObject(DBECommandContext commandContext, CONTAINER_TYPE parent, Object copyFrom)
     {
-        OBJECT_TYPE newObject = createDatabaseObject(commandContext, parent, copyFrom);
+        OBJECT_TYPE newObject;
+        try {
+            newObject = createDatabaseObject(commandContext, parent, copyFrom);
+        } catch (ClassCastException e) {
+            throw new IllegalArgumentException("Can't create object here.\nWrong container type: " + parent.getClass().getSimpleName());
+        }
         if (newObject == null) {
             return null;
         }
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 eb4000023f..477c4b8c47 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
@@ -366,12 +366,17 @@ public class GeneralUtils {
     @NotNull
     public static String getExceptionMessage(@NotNull Throwable ex)
     {
-        StringBuilder msg = new StringBuilder(/*CommonUtils.getShortClassName(ex.getClass())*/);
+/*
+        StringBuilder msg = new StringBuilder(*/
+/*CommonUtils.getShortClassName(ex.getClass())*//*
+);
         msg.append(ex.getClass().getSimpleName());
         if (ex.getMessage() != null) {
             msg.append(": ").append(ex.getMessage());
         }
         return msg.toString().trim();
+*/
+        return ex.getMessage();
     }
 
     @NotNull
-- 
GitLab