db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb DBSchema.java
Date Sat, 13 Sep 2003 16:59:44 GMT
brj         2003/09/13 09:59:44

  Modified:    src/java/org/apache/ojb/tools/mapping/reversedb
                        DBSchema.java
  Log:
  prevent NPE
  patch by Jason Pyeron
  
  Revision  Changes    Path
  1.9       +7 -3      db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb/DBSchema.java
  
  Index: DBSchema.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/tools/mapping/reversedb/DBSchema.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DBSchema.java	29 Jun 2003 14:28:07 -0000	1.8
  +++ DBSchema.java	13 Sep 2003 16:59:44 -0000	1.9
  @@ -124,8 +124,9 @@
         // Pointbase returns the catalog name in uppercase here and in mixed
         // case in getCatalogs(). Therefore we have to use toUpper().
         if (   
  -             (strTableCat == null && this.getDBCatalog().getCatalogName() == null
|| strTableCat.equalsIgnoreCase(this.getDBCatalog().getCatalogName()))
  -           &&(strSchemaName == null && this.getSchemaName() == null ||
strSchemaName.equals(this.getSchemaName()))
  +          (strTableCat!=null && strTableCat.equalsIgnoreCase(this.getDBCatalog().getCatalogName())
|| strTableCat==this.getDBCatalog().getCatalogName())
  +          &&
  +          (strSchemaName!=null && strSchemaName.equals(this.getSchemaName()) ||
strSchemaName==this.getSchemaName())
            )
           this.addTable(strTableName, strTableType);
         
  @@ -280,6 +281,10 @@
   
   /***************************** Changelog *****************************
   // $Log$
  +// Revision 1.9  2003/09/13 16:59:44  brj
  +// prevent NPE
  +// patch by Jason Pyeron
  +//
   // Revision 1.8  2003/06/29 14:28:07  florianbruckner
   // fix a bug that could cause problems with all databases that use mixed or lower case
catalog names (e.g. Informix, MySQL)
   //
  
  
  

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


Mime
View raw message