You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2005/03/03 14:27:23 UTC

cvs commit: ws-jaxme/src/js/org/apache/ws/jaxme/sqls/impl ColumnReferenceImpl.java

jochen      2005/03/03 05:27:23

  Modified:    src/js/org/apache/ws/jaxme/sqls/impl
                        ColumnReferenceImpl.java
  Log:
  NPE fix
  
  Revision  Changes    Path
  1.5       +11 -2     ws-jaxme/src/js/org/apache/ws/jaxme/sqls/impl/ColumnReferenceImpl.java
  
  Index: ColumnReferenceImpl.java
  ===================================================================
  RCS file: /home/cvs/ws-jaxme/src/js/org/apache/ws/jaxme/sqls/impl/ColumnReferenceImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ColumnReferenceImpl.java	17 Feb 2005 16:07:43 -0000	1.4
  +++ ColumnReferenceImpl.java	3 Mar 2005 13:27:23 -0000	1.5
  @@ -69,8 +69,17 @@
            return false;
         }
         ColumnReference ref = (ColumnReference) o;
  -      return ref.getTableReference().equals(getTableReference())  &&
  -             ref.getColumn().equals(getColumn());
  +	  Column c1 = ref.getColumn();
  +	  Column c2 = getColumn();
  +	  if (c1 == null  ||  c2 == null) {
  +		  return super.equals(o);
  +	  }
  +	  TableReference t1 = ref.getTableReference();
  +	  TableReference t2 = ref.getTableReference();
  +	  if (t1 == null  ||  t2 == null) {
  +		  return super.equals(o);
  +	  }
  +      return t1.equals(t2)  &&  c1.equals(c2);
      }
   
      public int hashCode() {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org