cvs commit: xml-cocoon2/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb ServerImpl.java

[haul]

haul        2002/12/17 07:02:14

  Modified:    
src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java
                        esql.xsl
               src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb
                        ServerImpl.java
  Log:
    <action dev="CH" type="fix" due-to-email="[EMAIL PROTECTED]"
     due-to="Stuart Roebuck" fixes-bug="15136">
     Fixing various inefficient logging calls.
    </action>
  
  Revision  Changes    Path
  1.6       +5 -3      
xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl
  
  Index: esql.xsl
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/blocks/databases/java/org/apache/cocoon/components/language/markup/xsp/java/esql.xsl,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- esql.xsl  6 Dec 2002 09:24:22 -0000       1.5
  +++ esql.xsl  17 Dec 2002 15:02:14 -0000      1.6
  @@ -515,7 +515,9 @@
             _esql_query.execute();
           </xsl:otherwise>
         </xsl:choose>
  -      getLogger().debug("esql query: " + _esql_query.getQueryString());
  +      if (getLogger().isDebugEnabled()) {
  +        getLogger().debug("esql query: " + _esql_query.getQueryString());
  +      }
   
         <xsl:call-template name="do-results"/>
   
  
  
  
  1.2       +12 -6     
xml-cocoon2/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java
  
  Index: ServerImpl.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/blocks/hsqldb/java/org/apache/cocoon/components/hsqldb/ServerImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServerImpl.java   18 Oct 2002 14:04:26 -0000      1.1
  +++ ServerImpl.java   17 Dec 2002 15:02:14 -0000      1.2
  @@ -134,7 +134,9 @@
               arguments[6] = "-database";
               arguments[7] = new File(dbPath).getCanonicalPath();
               arguments[7] += File.separator + "cocoondb";
  -            getLogger().debug("database is " + arguments[7]);
  +            if (getLogger().isDebugEnabled()) {
  +                getLogger().debug("database is " + arguments[7]);
  +            }
           } catch (MalformedURLException e) {
               getLogger().error("MalformedURLException - Could not get database 
directory ", e);
           } catch (IOException e) {
  @@ -171,7 +173,9 @@
                   try {
                       connection.close();
                   } catch (SQLException e) {
  -                    getLogger().debug("Shutting down HSQLDB: Ignoring exception: " 
+ e);
  +                    if (getLogger().isDebugEnabled()) {
  +                        getLogger().debug("Shutting down HSQLDB: Ignoring 
exception: " + e);
  +                    }
                   }
               } catch (Exception e){
                   getLogger().error("Error while shutting down HSQLDB", e);
  @@ -185,9 +189,11 @@
               started = true;
   
               try {
  -                getLogger().debug("HSQLDB Server arguments are as follows:");
  -                for(int i=0;i<8;i++) {
  -                    getLogger().debug(i + " : " + arguments[i]);
  +                if (getLogger().isDebugEnabled()) {
  +                    getLogger().debug("HSQLDB Server arguments are as follows:");
  +                    for(int i=0;i<8;i++) {
  +                        getLogger().debug(i + " : " + arguments[i]);
  +                    }
                   }
   
                   org.hsqldb.Server.main(arguments);
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     [EMAIL PROTECTED]
To unsubscribe, e-mail:          [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]