psmith 2004/05/24 18:01:02
Modified: src/java/org/apache/log4j/net SocketHubReceiver.java
SocketNode.java
src/java/org/apache/log4j/chainsaw/version
VersionManager.java
src/java/org/apache/log4j/chainsaw/help release-notes.html
Log:
fixed a bug where the SocketNode was catching a remote socket problem but
was not notifying it's listeners correctly.
The Receiver therefor did not know that it should restart up the Connector
thread.
Revision Changes Path
1.10 +3 -0
logging-log4j/src/java/org/apache/log4j/net/SocketHubReceiver.java
Index: SocketHubReceiver.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketHubReceiver.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SocketHubReceiver.java 19 Dec 2003 03:19:41 -0000 1.9
+++ SocketHubReceiver.java 25 May 2004 01:01:01 -0000 1.10
@@ -200,6 +200,9 @@
Listen for a socketClosedEvent from the SocketNode. Reopen the
socket if this receiver is still active. */
public void socketClosedEvent(Exception e) {
+ // we clear the connector object here so that it actually does reconnect if
the
+ // remote socket dies.
+ connector = null;
fireConnector(true);
}
1.30 +1 -1 logging-log4j/src/java/org/apache/log4j/net/SocketNode.java
Index: SocketNode.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/SocketNode.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- SocketNode.java 27 Feb 2004 16:47:32 -0000 1.29
+++ SocketNode.java 25 May 2004 01:01:01 -0000 1.30
@@ -187,7 +187,7 @@
}
// send event to listener, if configured
- if (listener != null) {
+ if (listener != null || listenerList.getListenerCount()>0) {
fireSocketClosedEvent(listenerException);
}
}
1.5 +1 -1
logging-log4j/src/java/org/apache/log4j/chainsaw/version/VersionManager.java
Index: VersionManager.java
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/version/VersionManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VersionManager.java 24 May 2004 22:25:30 -0000 1.4
+++ VersionManager.java 25 May 2004 01:01:01 -0000 1.5
@@ -10,7 +10,7 @@
private static final VersionManager instance = new VersionManager();
- private static final String VERSION_INFO = "1.99.99 (25th May 2004 08:00
GMT+10)";
+ private static final String VERSION_INFO = "1.99.99 (25th May 2004 11:00
GMT+10)";
public static final VersionManager getInstance() {
return instance;
1.14 +7 -0
logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html
Index: release-notes.html
===================================================================
RCS file:
/home/cvs/logging-log4j/src/java/org/apache/log4j/chainsaw/help/release-notes.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- release-notes.html 24 May 2004 22:25:30 -0000 1.13
+++ release-notes.html 25 May 2004 01:01:01 -0000 1.14
@@ -8,6 +8,13 @@
<h2>Release Notes</h2>
+<h2>1.99.99 (25th May 2004 11:00 GMT+10)</h2>
+<ul>
+ <li>Fixed a bug in the SocketNode class that prevented listeners of being notified
when the Socket dies. Unfortunately one
+ of the listeners is usually the Receiver, and it then does not know that it should
periodically
+ try to reconnect again!</li>
+</ul>
+
<h2>1.99.99 (25th May 2004 08:00 GMT+10)</h2>
<ul>
<li>Fixed a bug in the Receivers tree panel where restarting a set of receivers
would duplicate them visually. The plugins where stopped and started, but duplicate
tree nodes where being added. Thanks to Stephen Pain for
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
