Attachment 73338 Details for Bug 194838 – Fix the NPE reported by Kevin

[patch] Fix the NPE reported by Kevin

patch_194838_1.txt (text/plain), 2.20 KB, created by Xuan Chen

on 2007-07-09 11:35:11 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Xuan Chen

Created: 2007-07-09 11:35:11 EDT

Size: 2.20 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rse.ui
>Index: model/org/eclipse/rse/ui/internal/model/SystemRegistry.java
>===================================================================
>RCS file: /cvsroot/dsdp/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/model/org/eclipse/rse/ui/internal/model/SystemRegistry.java,v
>retrieving revision 1.28
>diff -u -r1.28 SystemRegistry.java
>--- model/org/eclipse/rse/ui/internal/model/SystemRegistry.java	9 Jul 2007 13:17:34 -0000	1.28
>+++ model/org/eclipse/rse/ui/internal/model/SystemRegistry.java	9 Jul 2007 15:18:00 -0000
>@@ -1056,11 +1056,20 @@
> 			ISystemDragDropAdapter adapter = null;
> 	    	
> 			adapter = (ISystemDragDropAdapter)((IAdaptable)firstObject).getAdapter(ISystemDragDropAdapter.class);
>+			String subSystemId = null; 
>       	
>       	  	if (adapter != null ) {
>       		  // first need to check subsystems
>       		  ISubSystem subSystem = adapter.getSubSystem(firstObject);
>-      		  String subSystemId = getAbsoluteNameForSubSystem(subSystem);
>+      		  if (null != subSystem)
>+      		  {
>+      			  subSystemId = getAbsoluteNameForSubSystem(subSystem);
>+      		  }
>+      		  else
>+      		  {
>+      			  subSystemId = "";  //$NON-NLS-1$
>+      		  }
>+      		
>       		  if (firstObjectFullName != null)
>       		  {
>       			firstObjectAbsoluteNameWithSubSystemId = subSystemId + ":" + firstObjectFullName; //$NON-NLS-1$
>@@ -1081,11 +1090,19 @@
> 			ISystemDragDropAdapter adapter = null;
> 	    	
> 			adapter = (ISystemDragDropAdapter)((IAdaptable)secondObject).getAdapter(ISystemDragDropAdapter.class);
>+			String subSystemId = null; 
>       	
>       	  	if (adapter != null ) {
>       		  // first need to check subsystems
>       		  ISubSystem subSystem = adapter.getSubSystem(secondObject);
>-      		  String subSystemId = getAbsoluteNameForSubSystem(subSystem);
>+      		  if (null != subSystem)
>+    		  {
>+    			  subSystemId = getAbsoluteNameForSubSystem(subSystem);
>+    		  }
>+    		  else
>+    		  {
>+    			  subSystemId = "";  //$NON-NLS-1$
>+    		  }
>       		  if (secondObjectFullName != null)
>     		  {
>     			secondObjectAbsoluteNameWithSubSystemId = subSystemId + ":" + secondObjectFullName; //$NON-NLS-1$

Flags:

mober.at+eclipse: iplog+

Actions: View | Diff

Attachments on bug 194838: 73269 | 73338