psmith 2003/06/22 19:54:01
Modified: src/java/org/apache/log4j/net XMLSocketReceiver.java
UDPReceiver.java
src/java/org/apache/log4j/jdbc JDBCReceiver.java
Log:
Changes to back out the addition of the setActive method.
Revision Changes Path
1.5 +7 -6
jakarta-log4j-sandbox/src/java/org/apache/log4j/net/XMLSocketReceiver.java
Index: XMLSocketReceiver.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/net/XMLSocketReceiver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLSocketReceiver.java 20 Jun 2003 04:52:21 -0000 1.4
+++ XMLSocketReceiver.java 23 Jun 2003 02:54:00 -0000 1.5
@@ -61,7 +61,7 @@
/**
XMLSocketReceiver receives a remote logging event via XML on a configured
- socket and "posts" it to a LoggerRepository as if the event were
+ socket and "posts" it to a LoggerRepository as if the event were
generated locally. This class is designed to receive events from
the XMLSocketAppender class (or classes that send compatible events).
@@ -74,8 +74,9 @@
public class XMLSocketReceiver extends Receiver implements Runnable, PortBased {
protected int port;
protected boolean active = false;
+
//default to log4j xml decoder
- protected String decoder="org.apache.log4j.xml.XMLDecoder";
+ protected String decoder = "org.apache.log4j.xml.XMLDecoder";
private ServerSocket serverSocket;
private Vector socketList = new Vector();
@@ -143,7 +144,7 @@
Thread rThread = new Thread(this);
rThread.setDaemon(true);
rThread.start();
- setActive(true);
+ active = true;
}
}
@@ -180,7 +181,7 @@
/**
Loop, accepting new socket connections. */
public void run() {
- setActive(true);
+ active = true;
// start the server socket
try {
@@ -189,7 +190,7 @@
LogLog.error(
"error starting SocketReceiver (" + this.getName()
+ "), receiver did not start", e);
- setActive(false);
+ active = false;
return;
}
@@ -227,6 +228,6 @@
+ this.getName() + "), stopping", e);
}
- setActive(false);
+ active = false;
}
}
1.14 +1 -1
jakarta-log4j-sandbox/src/java/org/apache/log4j/net/UDPReceiver.java
Index: UDPReceiver.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/net/UDPReceiver.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- UDPReceiver.java 20 Jun 2003 04:52:30 -0000 1.13
+++ UDPReceiver.java 23 Jun 2003 02:54:00 -0000 1.14
@@ -198,7 +198,7 @@
}
public void run() {
- setActive(true);
+ active = true;
byte[] b = new byte[PACKET_LENGTH];
DatagramPacket p = new DatagramPacket(b, b.length);
1.8 +1 -2
jakarta-log4j-sandbox/src/java/org/apache/log4j/jdbc/JDBCReceiver.java
Index: JDBCReceiver.java
===================================================================
RCS file:
/home/cvs/jakarta-log4j-sandbox/src/java/org/apache/log4j/jdbc/JDBCReceiver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JDBCReceiver.java 20 Jun 2003 04:52:45 -0000 1.7
+++ JDBCReceiver.java 23 Jun 2003 02:54:01 -0000 1.8
@@ -188,7 +188,6 @@
}
public synchronized void shutdown() {
- setActive(false);
}
public void setRefreshMillis(String s) {
@@ -249,7 +248,7 @@
}
public void run() {
- setActive(true);
+ active = true;
do {
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
