commit 75769430f03e90025a5b23fa0bbeddbe8688e5b7
author ledunnel Tue Aug 05 17:13:32 2008 +0000
committer ledunnel Tue Aug 05 17:13:32 2008 +0000
tree e7d5053dc75ec8d57dc4c23076a61a25adb658bc
parent 222e9386588f41a4f581d69f4accac8080f12778

[243107]   NPE triggered by the bookmark decorator

plugins/org.eclipse.datatools.connectivity.sqm.server.ui/src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/util/TransientEObjectUtil.java

diff --git a/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/util/TransientEObjectUtil.java b/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/util/TransientEObjectUtil.java
index 481d9c1..9e71648 100644
--- a/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/util/TransientEObjectUtil.java
+++ b/plugins/org.eclipse.datatools.connectivity.sqm.server.ui/src/org/eclipse/datatools/connectivity/sqm/server/internal/ui/util/TransientEObjectUtil.java
@@ -18,6 +18,7 @@
 import org.eclipse.datatools.connectivity.sqm.core.connection.ConnectionInfo;
 import org.eclipse.datatools.connectivity.sqm.core.containment.ContainmentService;
 import org.eclipse.datatools.connectivity.sqm.core.internal.ui.services.IElementIDProvider;
+import org.eclipse.datatools.connectivity.sqm.core.rte.ICatalogObject;
 import org.eclipse.datatools.connectivity.sqm.internal.core.RDBCorePlugin;
 import org.eclipse.datatools.connectivity.sqm.internal.core.util.ConnectionUtil;
 import org.eclipse.datatools.modelbase.sql.schema.SQLObject;
@@ -142,7 +143,7 @@
     {
         try
         {
-            return getEObjectId(eObject);
+            return eObject instanceof ICatalogObject ? getEObjectId(eObject) : null;
         }
         catch (Exception e)
         {