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 21:53:20 UTC

svn commit: r1172775 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java

Author: dkulp
Date: Mon Sep 19 19:53:20 2011
New Revision: 1172775

URL: http://svn.apache.org/viewvc?rev=1172775&view=rev
Log:
Merged revisions 1153049 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1153049 | davsclaus | 2011-08-02 03:14:03 -0400 (Tue, 02 Aug 2011) | 1 line
  
  Fixed problem with attribute not using same type in ManagedThreadPool causing that option not accessible in JMX
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java?rev=1172775&r1=1172774&r2=1172775&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedThreadPool.java Mon Sep 19 19:53:20 2011
@@ -149,7 +149,7 @@ public class ManagedThreadPool {
     }
 
     @ManagedAttribute(description = "Keep alive time in seconds")
-    public void setKeepAliveTime(int keepAliveTimeInSeconds) {
+    public void setKeepAliveTime(long keepAliveTimeInSeconds) {
         threadPool.setKeepAliveTime(keepAliveTimeInSeconds, TimeUnit.SECONDS);
     }