Return-Path: 
 <commits-return-2446-apmail-logging-commits-archive=logging.apache.org@logging.apache.org>
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 0739510AC7
	for <apmail-logging-commits-archive@minotaur.apache.org>;
 Mon, 10 Jun 2013 06:48:40 +0000 (UTC)
Received: (qmail 72755 invoked by uid 500); 10 Jun 2013 06:48:38 -0000
Delivered-To: apmail-logging-commits-archive@logging.apache.org
Received: (qmail 72724 invoked by uid 500); 10 Jun 2013 06:48:33 -0000
Mailing-List: contact commits-help@logging.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@logging.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@logging.apache.org>
List-Post: <mailto:commits@logging.apache.org>
List-Id: <commits.logging.apache.org>
Reply-To: dev@logging.apache.org
Delivered-To: mailing list commits@logging.apache.org
Received: (qmail 72717 invoked by uid 99); 10 Jun 2013 06:48:30 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jun 2013 06:48:30 +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, 10 Jun 2013 06:48:29 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 5C35D2388900;
	Mon, 10 Jun 2013 06:48:10 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1491348 - in /logging/log4j/log4j2/trunk:
 core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
 core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
 src/changes/changes.xml
Date: Mon, 10 Jun 2013 06:48:10 -0000
To: commits@logging.apache.org
From: rgoers@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130610064810.5C35D2388900@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rgoers
Date: Mon Jun 10 06:48:09 2013
New Revision: 1491348

URL: http://svn.apache.org/r1491348
Log:
LOG4J2-139 - Fix NullPointerException when no protocol is specified. Regression introduced by fix for LOG4J2-228

Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
    logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.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=1491348&r1=1491347&r2=1491348&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 Jun 10 06:48:09 2013
@@ -115,8 +115,7 @@ public class SocketAppender<T extends Se
             return null;
         }
 
-        final String prot = protocol != null ? protocol : Protocol.TCP.name();
-        final Protocol p = EnglishEnums.valueOf(Protocol.class, protocol);
+        final Protocol p = EnglishEnums.valueOf(Protocol.class, protocol != null ? protocol : Protocol.TCP.name());
         if (p.equals(Protocol.UDP)) {
             isFlush = true;
         }

Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java?rev=1491348&r1=1491347&r2=1491348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java (original)
+++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java Mon Jun 10 06:48:09 2013
@@ -122,6 +122,15 @@ public class SocketAppenderTest {
         assertTrue("Message not delivered via TCP", tcpCount > 1);
     }
 
+    @Test
+    public void testDefaultProtocol() throws Exception {
+
+        final SocketAppender appender = SocketAppender.createAppender("localhost", PORT, null, "-1",
+            "false", "Test", null, null, null, null, null, null);
+        assertNotNull(appender);
+    }
+
+
 
     @Test
     public void testUDPAppender() throws Exception {

Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1491348&r1=1491347&r2=1491348&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Mon Jun 10 06:48:09 2013
@@ -23,6 +23,9 @@
   </properties>
   <body>
     <release version="2.0-beta8" date="2013-??-??" description="Bug fixes and enhancements">
+      <action issue="LOG4J2-139" dev="rgoers" type="fix">
+        Fix NullPointerException (regression due to fix for LOG4J2-228)
+      </action>
       <action issue="LOG4J2-168" dev="rgoers" type="update" due-to="Scott Severtson">
         Allow elements of the logging event to be added to the mdc structured data in RFC5424Layout.
       </action>