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/14 22:01:41 UTC

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

yoavs       2004/12/14 13:01:41

  Modified:    docs     HISTORY.txt
               src/java/org/apache/log4j/net SocketHubAppender.java
  Log:
  Bugzlla 28682.
  
  Revision  Changes    Path
  1.17      +2 -0      logging-log4j/docs/HISTORY.txt
  
  Index: HISTORY.txt
  ===================================================================
  RCS file: /home/cvs/logging-log4j/docs/HISTORY.txt,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- HISTORY.txt	14 Dec 2004 20:50:39 -0000	1.16
  +++ HISTORY.txt	14 Dec 2004 21:01:41 -0000	1.17
  @@ -41,6 +41,8 @@
   
    - Fixed Bugzilla 26658: modify build.xml chainsaw target with respect to crimson.jar [*]
   
  + - Fixed Bugzilla 28682: NullPointerException in SocketHubAppender#cleanup. [*]
  +
     November 25, 2004
   
    - Release of version 1.3alpha-3
  
  
  
  1.11      +5 -2      logging-log4j/src/java/org/apache/log4j/net/SocketHubAppender.java
  
  Index: SocketHubAppender.java
  ===================================================================
  RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketHubAppender.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SocketHubAppender.java	20 Nov 2004 15:46:02 -0000	1.10
  +++ SocketHubAppender.java	14 Dec 2004 21:01:41 -0000	1.11
  @@ -155,8 +155,11 @@
     public void cleanUp() {
       // stop the monitor thread
       getLogger().debug("stopping ServerSocket");
  -    serverMonitor.stopMonitor();
  -    serverMonitor = null;
  +    
  +    if(serverMonitor != null) {
  +        serverMonitor.stopMonitor();
  +        serverMonitor = null;
  +    }
   
       // close all of the connections
       getLogger().debug("closing client connections");
  
  
  

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