Author: carnold
Date: Thu Nov 15 11:07:32 2007
New Revision: 595394
URL: http://svn.apache.org/viewvc?rev=595394&view=rev
Log:
Bug 43874: SocketHubAppender should expose actual port in use to extending
classes
Modified:
logging/log4j/trunk/src/changes/changes.xml
logging/log4j/trunk/src/main/java/org/apache/log4j/net/SocketHubAppender.java
Modified: logging/log4j/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=595394&r1=595393&r2=595394&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Thu Nov 15 11:07:32 2007
@@ -22,6 +22,7 @@
<body>
<release version="1.2.16" date="TBD" description="">
+ <action issue="43313">log4j 1.2.16 release preparation.</action>
<action action="fix" issue="43298">log4j.dtd defines class attribute
for category element, but not for logger.</action>
<action action="fix" issue="43314">SMTPAppender.setSMTPUserName and
others missing @since tags.</action>
<action action="fix" issue="43618">Request for compile-on-Windows help
file in src package.</action>
@@ -31,6 +32,7 @@
<action action="fix" issue="43312">Fix mangled
source-repository.html.</action>
<action action="fix" issue="43387">Minor documentation changes.</action>
<action action="fix" issue="43304">Make javamail, jmx, jms dependencies
optional in pom.xml.</action>
+ <action action="add" issue="43874">SocketHubAppender should expose
actual port in use to extending classes.</action>
</release>
<release version="1.2.15" date="2007-08-24" description="SyslogAppender
enhancements, NTEventLogAppender and Maven build.">
Modified:
logging/log4j/trunk/src/main/java/org/apache/log4j/net/SocketHubAppender.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/net/SocketHubAppender.java?rev=595394&r1=595393&r2=595394&view=diff
==============================================================================
---
logging/log4j/trunk/src/main/java/org/apache/log4j/net/SocketHubAppender.java
(original)
+++
logging/log4j/trunk/src/main/java/org/apache/log4j/net/SocketHubAppender.java
Thu Nov 15 11:07:32 2007
@@ -271,6 +271,16 @@
}
/**
+ * Creates a server socket to accept connections.
+ * @param socketPort port on which the socket should listen, may be zero.
+ * @return new socket.
+ * @throws IOException IO error when opening the socket.
+ */
+ protected ServerSocket createServerSocket(final int socketPort) throws
IOException {
+ return new ServerSocket(socketPort);
+ }
+
+ /**
This class is used internally to monitor a ServerSocket
and register new connections in a vector passed in the
constructor. */
@@ -322,7 +332,7 @@
void run() {
ServerSocket serverSocket = null;
try {
- serverSocket = new ServerSocket(port);
+ serverSocket = createServerSocket(port);
serverSocket.setSoTimeout(1000);
}
catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
