db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bri...@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/platforms TorqueDBHandling.java
Date Sun, 23 May 2004 16:33:34 GMT
brianm      2004/05/23 09:33:34

  Modified:    src/java/org/apache/ojb/broker/platforms
                        TorqueDBHandling.java
  Log:
  Improved javadocs and error reporting patch submitted by Robert Sfeir
  Submitted by:	Robert Sfeir
  
  Revision  Changes    Path
  1.5       +12 -6     db-ojb/src/java/org/apache/ojb/broker/platforms/TorqueDBHandling.java
  
  Index: TorqueDBHandling.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/platforms/TorqueDBHandling.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TorqueDBHandling.java	4 Apr 2004 23:53:35 -0000	1.4
  +++ TorqueDBHandling.java	23 May 2004 16:33:34 -0000	1.5
  @@ -23,6 +23,7 @@
   import java.util.zip.GZIPOutputStream;
   
   import org.apache.ojb.broker.metadata.JdbcConnectionDescriptor;
  +import org.apache.ojb.broker.util.logging.LoggerFactory;
   import org.apache.tools.ant.Project;
   import org.apache.tools.ant.taskdefs.SQLExec;
   import org.apache.tools.ant.types.FileSet;
  @@ -161,7 +162,7 @@
       /**
        * Adds an input stream of a db definition (in our case of a torque schema file).
        * 
  -     * @param schemataStream The input stream
  +     * @param schemaStream The input stream
        */
       public void addDBDefinitionFile(InputStream schemaStream) throws IOException
       {
  @@ -298,7 +299,14 @@
               // clean-up
               if ((tmpDir != null) && tmpDir.exists())
               {
  -                scriptFile.delete();
  +                try
  +                {
  +                    scriptFile.delete();
  +                }
  +                catch (NullPointerException e) 
  +                {
  +                    LoggerFactory.getLogger(this.getClass()).error("NPE While deleting
scriptFile [" + scriptFile.getName() + "]", e);
  +                }
               }
               throw new PlatformException(ex);
           }
  @@ -429,8 +437,7 @@
        * Template-and-Hook method for generating the url required by the jdbc driver
        * to allow for creating a database (as opposed to accessing an already-existing
        * database).
  -     * 
  -     * @param jcd The jdbc connection descriptor
  +     *
        */
       protected String getDBCreationUrl()
       {
  @@ -503,8 +510,7 @@
       /**
        * Template-and-Hook method for generating the url required by the jdbc driver
        * to allow for modifying an existing database.
  -     * 
  -     * @param jcd The jdbc connection descriptor
  +     *
        */
       protected String getDBManipulationUrl()
       {
  
  
  

---------------------------------------------------------------------
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