Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2383FE09C for ; Mon, 7 Jan 2013 00:49:50 +0000 (UTC) Received: (qmail 40346 invoked by uid 500); 7 Jan 2013 00:49:50 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 40322 invoked by uid 500); 7 Jan 2013 00:49:50 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 40315 invoked by uid 99); 7 Jan 2013 00:49:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2013 00:49:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Jan 2013 00:49:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 45EA92388847; Mon, 7 Jan 2013 00:49:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1429632 - in /logging/log4j/log4j2/trunk: core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java src/changes/changes.xml Date: Mon, 07 Jan 2013 00:49:29 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130107004929.45EA92388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgoers Date: Mon Jan 7 00:49:28 2013 New Revision: 1429632 URL: http://svn.apache.org/viewvc?rev=1429632&view=rev Log: LOG4J2-139 - Fix null pointer exception in SocketAppender if no protocol is specified. The protocol will default to TCP for the SocketAppender and UDP for the SyslogAppender. Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java logging/log4j/log4j2/trunk/src/changes/changes.xml Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java?rev=1429632&r1=1429631&r2=1429632&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java Mon Jan 7 00:49:28 2013 @@ -80,7 +80,9 @@ public class SocketAppender extends Abst return null; } - final AbstractSocketManager manager = createSocketManager(protocol, host, port, reconnectDelay); + final String prot = protocol != null ? protocol : Protocol.TCP.name(); + + final AbstractSocketManager manager = createSocketManager(prot, host, port, reconnectDelay); if (manager == null) { return null; } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java?rev=1429632&r1=1429631&r2=1429632&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SyslogAppender.java Mon Jan 7 00:49:28 2013 @@ -27,6 +27,7 @@ import org.apache.logging.log4j.core.con import org.apache.logging.log4j.core.layout.RFC5424Layout; import org.apache.logging.log4j.core.layout.SyslogLayout; import org.apache.logging.log4j.core.net.AbstractSocketManager; +import org.apache.logging.log4j.core.net.Protocol; import java.nio.charset.Charset; @@ -122,7 +123,8 @@ public class SyslogAppender extends Sock LOGGER.error("No name provided for SyslogAppender"); return null; } - final AbstractSocketManager manager = createSocketManager(protocol, host, port, reconnectDelay); + final String prot = protocol != null ? protocol : Protocol.UDP.name(); + final AbstractSocketManager manager = createSocketManager(prot, host, port, reconnectDelay); if (manager == null) { return null; } Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1429632&r1=1429631&r2=1429632&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/src/changes/changes.xml (original) +++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Jan 7 00:49:28 2013 @@ -23,6 +23,10 @@ + + Fix null pointer exception in SocketAppender if no protocol is specified. The protocol will default + to TCP for the SocketAppender and UDP for the SyslogAppender. + Added Log4j 2 to SLF4J adapter.