You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 22:36:52 UTC
svn commit: r1172806 - in /camel/branches/camel-2.8.x: ./
components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Author: dkulp
Date: Mon Sep 19 20:36:52 2011
New Revision: 1172806
URL: http://svn.apache.org/viewvc?rev=1172806&view=rev
Log:
Merged revisions 1157531 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1157531 | davsclaus | 2011-08-14 09:45:06 -0400 (Sun, 14 Aug 2011) | 1 line
Indicate in thread names from JettyHttpComponent they are from this component, to differentiate them with other Jetty usages in the JVM.
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java?rev=1172806&r1=1172805&r2=1172806&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java Mon Sep 19 20:36:52 2011
@@ -21,7 +21,6 @@ import java.net.URI;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import javax.management.MBeanServer;
import javax.servlet.Filter;
@@ -593,6 +592,8 @@ public class JettyHttpComponent extends
if (httpClientMaxThreads != null) {
qtp.setMaxThreads(httpClientMaxThreads.intValue());
}
+ // let the thread names indicate they are from this component
+ qtp.setName("CamelJetty(" + ObjectHelper.getIdentityHashCode(this) + ")");
try {
qtp.start();
} catch (Exception e) {
@@ -603,7 +604,7 @@ public class JettyHttpComponent extends
httpClient.setThreadPool(getHttpClientThreadPool());
if (this.sslContextParameters != null) {
- ((CamelHttpClient) httpClient).setSSLContext(this.sslContextParameters.createSSLContext());
+ httpClient.setSSLContext(this.sslContextParameters.createSSLContext());
}
return httpClient;