incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: incubator-ftpserver/src/java/org/apache/ftpserver FtpWriter.java
Date Thu, 06 Oct 2005 05:58:47 GMT
rana_b      2005/10/05 22:58:47

  Modified:    src/java/org/apache/ftpserver FtpWriter.java
  Log:
  commons-logging used
  
  Revision  Changes    Path
  1.8       +5 -4      incubator-ftpserver/src/java/org/apache/ftpserver/FtpWriter.java
  
  Index: FtpWriter.java
  ===================================================================
  RCS file: /home/cvs/incubator-ftpserver/src/java/org/apache/ftpserver/FtpWriter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FtpWriter.java	22 Sep 2005 05:34:47 -0000	1.7
  +++ FtpWriter.java	6 Oct 2005 05:58:47 -0000	1.8
  @@ -24,11 +24,11 @@
   import java.net.InetAddress;
   import java.net.Socket;
   
  +import org.apache.commons.logging.Log;
   import org.apache.ftpserver.ftplet.FileSystemView;
   import org.apache.ftpserver.ftplet.FtpRequest;
   import org.apache.ftpserver.ftplet.FtpResponse;
   import org.apache.ftpserver.ftplet.FtpStatistics;
  -import org.apache.ftpserver.ftplet.Logger;
   import org.apache.ftpserver.interfaces.ConnectionObserver;
   import org.apache.ftpserver.interfaces.IFtpConfig;
   import org.apache.ftpserver.interfaces.IMessageResource;
  @@ -88,6 +88,7 @@
       
       /////////////////////////////////////////////////////////////////////////////
       
  +    private Log m_log;
       private Writer m_writer;
       private ConnectionObserver m_observer;
       private IFtpConfig m_fconfig;
  @@ -106,6 +107,7 @@
        */
       public void setFtpConfig(IFtpConfig fconfig) {
           m_fconfig = fconfig;
  +        m_log = m_fconfig.getLogFactory().getInstance(getClass());
       }
   
       /**
  @@ -140,8 +142,7 @@
           String lang = m_request.getLanguage();
           String msg = resource.getMessage(code, subId, lang);
           if(msg == null) {
  -            Logger logger = m_fconfig.getLogger();
  -            logger.warn("Message not found : " + code + ',' + subId + ',' + lang);
  +            m_log.error("Message not found : " + code + ',' + subId + ',' + lang);
               msg = "";
           }
           msg = replaceVariables(code, basicMsg, msg);
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message