From 2eeda90ebc086a38922af08f8cec5ca2f1edd073 Mon Sep 17 00:00:00 2001 From: David McKnight Date: Fri, 29 Jun 2007 14:30:28 +0000 Subject: [PATCH] [187713] Rupen's patch for checking to see if target is null --- .../internal/ui/view/SystemDNDTransferRunnable.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java index 47a23fa3411..91f3fb1290a 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemDNDTransferRunnable.java @@ -13,6 +13,7 @@ * Contributors: * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core * Martin Oberhuber (Wind River) - [186128][refactoring] Move IProgressMonitor last in public base classes + * Rupen Mardirossian (IBM) - [187713] Check to see if target is null before attempting to retrieve targetAdapter in tranferRSEResources method (line 248) ********************************************************************************/ package org.eclipse.rse.internal.ui.view; @@ -243,9 +244,15 @@ public class SystemDNDTransferRunnable extends WorkspaceJob ISubSystemConfiguration factory = targetSubSystem.getSubSystemConfiguration(); if (factory.supportsDropInFilters()) { - target = targetSubSystem.getTargetForFilter((ISystemFilterReference)target); - targetAdapter = (ISystemDragDropAdapter) ((IAdaptable) target).getAdapter(ISystemDragDropAdapter.class); - + target = targetSubSystem.getTargetForFilter((ISystemFilterReference)target); + if (target == null) + { + return false; + } + else + { + targetAdapter = (ISystemDragDropAdapter) ((IAdaptable) target).getAdapter(ISystemDragDropAdapter.class); + } } } if (targetAdapter.validateDrop(set, target, (targetSubSystem == srcSubSystem)))