[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[tm-cvs-commit] dmcknight org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view SystemTableTreeViewProvider.java

Update of /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view
In directory dev2:/tmp/cvs-serv13874/UI/org/eclipse/rse/internal/ui/view

Modified Files:
	SystemTableTreeViewProvider.java 
Log Message:
[370007] potential NPEs in table-tree provider and remote resource dialog


Index: SystemTableTreeViewProvider.java
===================================================================
RCS file: /cvsroot/tools/org.eclipse.tm.rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemTableTreeViewProvider.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SystemTableTreeViewProvider.java	2 Nov 2011 17:24:59 -0000	1.8
--- SystemTableTreeViewProvider.java	27 Jan 2012 20:53:00 -0000	1.9
***************
*** 1,4 ****
  /********************************************************************************
!  * Copyright (c) 2002, 2011 IBM Corporation and others. All rights reserved.
   * This program and the accompanying materials are made available under the terms
   * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
--- 1,4 ----
  /********************************************************************************
!  * Copyright (c) 2002, 2012 IBM Corporation and others. All rights reserved.
   * This program and the accompanying materials are made available under the terms
   * of the Eclipse Public License v1.0 which accompanies this distribution, and is 
***************
*** 14,17 ****
--- 14,18 ----
   * Martin Oberhuber (Wind River) - [186128] Move IProgressMonitor last in all API
   * David McKnight   (IBM)        - [362700] SystemTableTreeViewProvider should not use context object in adapter call to get subsystem
+  * David McKnight   (IBM)        - [370007] potential NPEs in table-tree provider and remote resource dialog
   ********************************************************************************/
  
***************
*** 200,210 ****
  	    		element = ((IContextObject)object).getModelObject();
  	    	}
- 			{
  				
! 				ISystemViewElementAdapter adapter = getAdapterFor(element);
  				adapter.setViewer(_viewer);
! 				
! 		
! 				
  				if (adapter.hasChildren((IAdaptable)element))
  				{
--- 201,210 ----
  	    		element = ((IContextObject)object).getModelObject();
  	    	}
  				
! 			ISystemViewElementAdapter adapter = getAdapterFor(element);
! 			if (adapter != null)
! 			{
  				adapter.setViewer(_viewer);
! 						
  				if (adapter.hasChildren((IAdaptable)element))
  				{