[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server ...

[Robert Stryker]

  User: rawb    
  Date: 07/01/10 17:03:31

  Modified:    as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server 
                        JBossServerTableViewer.java
  Log:
  null pointer exception found and fixed more gooder
  
  Revision  Changes    Path
  1.7       +4 -3      jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerTableViewer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JBossServerTableViewer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/JBossServerTableViewer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- JBossServerTableViewer.java	10 Jan 2007 21:50:34 -0000	1.6
  +++ JBossServerTableViewer.java	10 Jan 2007 22:03:31 -0000	1.7
  @@ -128,16 +128,17 @@
   		
   		public boolean equals(Object other) {
   			if( other == null ) return false;
  -			if( ((ContentWrapper)other).getElement() == null )
  -				return o == null;
   			
   			if( other instanceof ContentWrapper ) {
  +				if( ((ContentWrapper)other).getElement() == null )
  +					return o == null;
   				return ((ContentWrapper)other).getElement().equals(o); 
   			}
   			return false;
   		}
   		
   		public int hashCode() {
  +			if( o == null ) return super.hashCode();
   			return o.hashCode();
   		}
   	}