From 2bbcbb57bb8ef296a122d7274c60d1a6a633dade Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 24 Aug 2011 23:46:50 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51713
 Improve message that is logged if there is a typo in the value of protocol in
 a <Connector> element.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1161322 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/catalina/connector/Connector.java          | 5 ++---
 java/org/apache/catalina/connector/LocalStrings.properties | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/connector/Connector.java b/java/org/apache/catalina/connector/Connector.java
index 28cb5801c..7472ba4e5 100644
--- a/java/org/apache/catalina/connector/Connector.java
+++ b/java/org/apache/catalina/connector/Connector.java
@@ -74,9 +74,8 @@ public class Connector extends LifecycleMBeanBase  {
             Class<?> clazz = Class.forName(protocolHandlerClassName);
             this.protocolHandler = (ProtocolHandler) clazz.newInstance();
         } catch (Exception e) {
-            log.error
-                (sm.getString
-                 ("coyoteConnector.protocolHandlerInstantiationFailed", e));
+            log.error(sm.getString(
+                    "coyoteConnector.protocolHandlerInstantiationFailed", e), e);
         }
     }
 
diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties
index 7eea0ffdd..79cf7c643 100644
--- a/java/org/apache/catalina/connector/LocalStrings.properties
+++ b/java/org/apache/catalina/connector/LocalStrings.properties
@@ -21,7 +21,7 @@ coyoteConnector.cannotRegisterProtocol=Cannot register MBean for the Protocol
 coyoteConnector.invalidPort=The connector cannot start since the specified port value of [{0}] is invalid
 coyoteConnector.protocolHandlerDestroyFailed=Protocol handler destroy failed
 coyoteConnector.protocolHandlerInitializationFailed=Protocol handler initialization failed
-coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler instantiation failed
+coyoteConnector.protocolHandlerInstantiationFailed=Protocol handler instantiation failed: {0}
 coyoteConnector.protocolHandlerStartFailed=Protocol handler start failed
 coyoteConnector.protocolRegistrationFailed=Protocol JMX registration failed
 coyoteConnector.protocolHandlerPauseFailed=Protocol handler pause failed
-- 
2.11.0