db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mpoes...@apache.org
Subject cvs commit: jakarta-turbine-torque/src/java/org/apache/torque/util BasePeer.java
Date Fri, 10 Jan 2003 15:33:25 GMT
mpoeschl    2003/01/10 07:33:25

  Modified:    src/java/org/apache/torque/util BasePeer.java
  Log:
  undo the category -> logger renaming as it breaks the generated peer classes
  
  Revision  Changes    Path
  1.60      +11 -11    jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java
  
  Index: BasePeer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- BasePeer.java	9 Jan 2003 17:46:21 -0000	1.59
  +++ BasePeer.java	10 Jan 2003 15:33:24 -0000	1.60
  @@ -129,7 +129,7 @@
       private static Hashtable mapBuilders = new Hashtable(5);
   
       /** the log */
  -    protected static Logger logger = Logger.getLogger(BasePeer.class);
  +    protected static Logger category = Logger.getLogger(BasePeer.class);
   
       /**
        * Converts a hashtable to a byte array for storage/serialization.
  @@ -248,7 +248,7 @@
           }
           catch (Exception e)
           {
  -            logger.error(e);
  +            category.error(e);
               throw new Error(
                   "Error in BasePeer.initTableSchema("
                       + tableName
  @@ -282,7 +282,7 @@
           }
           catch (Exception e)
           {
  -            logger.error(e);
  +            category.error(e);
               throw new Error(
                   "Error in BasePeer.initTableColumns(): " + e.getMessage());
           }
  @@ -548,7 +548,7 @@
                   tds = new TableDataSet(con, tables.get(i), kd);
                   String sqlSnippet = whereClause.toString(" AND ");
   
  -                logger.debug("BasePeer.doDelete: whereClause=" + sqlSnippet);
  +                category.debug("BasePeer.doDelete: whereClause=" + sqlSnippet);
   
                   tds.where(sqlSnippet);
                   tds.fetchRecords();
  @@ -1002,7 +1002,7 @@
               sql = query.toString();
           }
   
  -        logger.debug(sql);
  +        category.debug(sql);
           return sql;
       }
   
  @@ -1549,7 +1549,7 @@
               // execute the query
               long startTime = System.currentTimeMillis();
               qds = new QueryDataSet(con, queryString);
  -            logger.debug(
  +            category.debug(
                   "Elapsed time="
                       + (System.currentTimeMillis() - startTime)
                       + " ms");
  @@ -1938,7 +1938,7 @@
                   // Get affected records.
                   tds = new TableDataSet(con, tables.get(i), kd);
                   String sqlSnippet = whereClause.toString(" AND ");
  -                logger.debug("BasePeer.doUpdate: whereClause=" + sqlSnippet);
  +                category.debug("BasePeer.doUpdate: whereClause=" + sqlSnippet);
                   tds.where(sqlSnippet);
                   tds.fetchRecords();
   
  @@ -2157,14 +2157,14 @@
               // return null.
               String message =
                   "BasePeer.MapBuilder failed trying to instantiate: " + name;
  -            if (logger == null)
  +            if (category == null)
               {
                   System.out.println(message);
                   e.printStackTrace();
               }
               else
               {
  -                logger.error(message, e);
  +                category.error(message, e);
               }
           }
           return null;
  @@ -2631,7 +2631,7 @@
               sql = query.toString();
           }
   
  -        logger.debug(sql);
  +        category.debug(sql);
           queryString.append(sql);
       }
   
  
  
  

Mime
View raw message