You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by yo...@apache.org on 2004/12/13 16:18:26 UTC

cvs commit: logging-log4j/src/java/org/apache/log4j/net TelnetAppender.java

yoavs       2004/12/13 07:18:26

  Modified:    docs     HISTORY.txt
               src/java/org/apache/log4j/net TelnetAppender.java
  Log:
  Bugzilla 15198: TelnetAppender: NullPointerException if SocketHandler not initialized.
  
  Revision  Changes    Path
  1.4       +10 -3     logging-log4j/docs/HISTORY.txt
  
  Index: HISTORY.txt
  ===================================================================
  RCS file: /home/cvs/logging-log4j/docs/HISTORY.txt,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- HISTORY.txt	25 Nov 2004 19:06:27 -0000	1.3
  +++ HISTORY.txt	13 Dec 2004 15:18:25 -0000	1.4
  @@ -8,16 +8,23 @@
      [D] Changes affect a method or property which was previously marked as 
          deprecated.
   
  +  December XX, 2004
  + - Release of version 1.3alpha-4
  +
  + - Fixed Bugzilla 15198: TelnetAppender: NullPointerException if
  +   SocketHandler not initialized.
  +
  +
     November 25, 2004
   
  - - Release of version 1.3apha-3
  + - Release of version 1.3alpha-3
    
    - Classes are built with the javac debug setting on.
    - Fixed unset activeFile bug in SlidingWindowRollingPolicy.
    
     November 25, 2004
   
  - - Release of version 1.3apha-2
  + - Release of version 1.3alpha-2
    
    - The deprecated DOMConfigrator was mistakenly left as the default
      configrator for XML files.  This has been fixed and JoranConfigrator
  @@ -25,7 +32,7 @@
    
    November 24th, 2004
   
  - - Release of version 1.3apha-1
  + - Release of version 1.3alpha-1
   
    - Log4j now uses itself for its own logging. For more details refer to
      
  
  
  
  1.7       +9 -2      logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java
  
  Index: TelnetAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/TelnetAppender.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TelnetAppender.java	20 Nov 2004 15:46:02 -0000	1.6
  +++ TelnetAppender.java	13 Dec 2004 15:18:26 -0000	1.7
  @@ -73,7 +73,7 @@
         sh = new SocketHandler(port);
         sh.start();
       } catch (Exception e) {
  -      e.printStackTrace();
  +        getLogger().error("Could not active TelnetAppender options: ", e);
       }
     }
   
  @@ -87,12 +87,19 @@
   
     /** shuts down the appender. */
     public void close() {
  -    sh.finalize();
  +      if(sh != null) {
  +          sh.finalize();
  +      }
     }
   
     /** Handles a log event.  For this appender, that means writing the
       message to each connected client.  */
     protected void append(LoggingEvent event) {
  +      if(sh == null) {
  +          getLogger().warn("SocketHandler is null, not sending event.");
  +          return;
  +      }
  +
       sh.send(this.layout.format(event));
   
       if (layout.ignoresThrowable()) {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: log4j-dev-unsubscribe@logging.apache.org
For additional commands, e-mail: log4j-dev-help@logging.apache.org