cvs commit: jakarta-log4j/src/java/org/apache/log4j/chainsaw LoggingReceiver.java

oburn       02/05/29 04:51:20

  Modified:    src/java/org/apache/log4j/chainsaw Tag: v1_2-branch
                        LoggingReceiver.java
  Log:
  Change made on the mainline that should be on the branch as well.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.1   +11 -11    jakarta-log4j/src/java/org/apache/log4j/chainsaw/LoggingReceiver.java
  
  Index: LoggingReceiver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-log4j/src/java/org/apache/log4j/chainsaw/LoggingReceiver.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- LoggingReceiver.java	9 May 2002 15:43:43 -0000	1.2
  +++ LoggingReceiver.java	29 May 2002 11:51:20 -0000	1.2.2.1
  @@ -23,7 +23,7 @@
    */
   class LoggingReceiver extends Thread {
       /** used to log messages **/
  -    private static final Logger logger = Logger.getLogger(LoggingReceiver.class);
  +    private static final Logger LOG = Logger.getLogger(LoggingReceiver.class);
   
       /**
        * Helper that actually processes a client connection. It receives events
  @@ -46,7 +46,7 @@
   
           /** loops getting the events **/
           public void run() {
  -            logger.debug("Starting to get data");
  +            LOG.debug("Starting to get data");
               try {
                   final ObjectInputStream ois =
                       new ObjectInputStream(mClient.getInputStream());
  @@ -55,19 +55,19 @@
                       mModel.addEvent(new EventDetails(event));
                   }
               } catch (EOFException e) {
  -                logger.info("Reached EOF, closing connection");
  +                LOG.info("Reached EOF, closing connection");
               } catch (SocketException e) {
  -                logger.info("Caught SocketException, closing connection");
  +                LOG.info("Caught SocketException, closing connection");
               } catch (IOException e) {
  -                logger.warn("Got IOException, closing connection", e);
  +                LOG.warn("Got IOException, closing connection", e);
               } catch (ClassNotFoundException e) {
  -                logger.warn("Got ClassNotFoundException, closing connection", e);
  +                LOG.warn("Got ClassNotFoundException, closing connection", e);
               }
   
               try {
                   mClient.close();
               } catch (IOException e) {
  -                logger.warn("Error closing connection", e);
  +                LOG.warn("Error closing connection", e);
               }
           }
       }
  @@ -93,19 +93,19 @@
   
       /** Listens for client connections **/
       public void run() {
  -        logger.info("Thread started");
  +        LOG.info("Thread started");
           try {
               while (true) {
  -                logger.debug("Waiting for a connection");
  +                LOG.debug("Waiting for a connection");
                   final Socket client = mSvrSock.accept();
  -                logger.debug("Got a connection from " +
  +                LOG.debug("Got a connection from " +
                             client.getInetAddress().getHostName());
                   final Thread t = new Thread(new Slurper(client));
                   t.setDaemon(true);
                   t.start();
               }
           } catch (IOException e) {
  -            logger.error("Error in accepting connections, stopping.", e);
  +            LOG.error("Error in accepting connections, stopping.", e);
           }
       }
   }