From ac18bf5896156cc51d34833938e9b91d4d47b712 Mon Sep 17 00:00:00 2001
From: ashatilov
Date: Wed, 7 Oct 2015 23:24:18 +0300
Subject: Bug 479275 - [Class diagram] Dropping of the
 RedefinableTemplateSignature causes NPE

Change-Id: I444f23b03da093aff0f8b10c6e97db1c79df6fd7
Signed-off-by: ashatilov <shatilov@montages.com>---
 .../papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/views')

diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
index 3bc3cd600b5..08645f83cc3 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/dnd/CommonDropAdapterAssistant.java
@@ -600,7 +600,9 @@ public class CommonDropAdapterAssistant extends org.eclipse.ui.navigator.CommonD
 
 							}
 						}
-
+						if (setRequest == null) {
+							continue;
+						}
 						Command requestCommand = getRequestCommand(targetContainer, setRequest);
 						if (requestCommand != null) {
 							separateCommand.add(requestCommand);
-- 
cgit v1.2.3