svn commit: r1086863 - in /servicemix/components/trunk/shared-libraries/servicemix-common/src: main/java/org/apache/servicemix/common/osgi/Configuration.java test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java

[ffang]

Author: ffang
Date: Wed Mar 30 07:38:08 2011
New Revision: 1086863

URL: http://svn.apache.org/viewvc?rev=1086863&view=rev
Log:
[SMXCOMP-863]Make allowsCoreThreadTimeOut name consistent across mbeans and 
properties

Modified:
    
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java
    
servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java

Modified: 
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java?rev=1086863&r1=1086862&r2=1086863&view=diff
==============================================================================
--- 
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java
 (original)
+++ 
servicemix/components/trunk/shared-libraries/servicemix-common/src/main/java/org/apache/servicemix/common/osgi/Configuration.java
 Wed Mar 30 07:38:08 2011
@@ -77,11 +77,11 @@ public class Configuration {
 
     /**
      * Allow the core threads to time out
-     * @see 
org.apache.servicemix.executors.impl.ExecutorConfig#setAllowCoreThreadsTimeout(boolean)
  
+     * @see 
org.apache.servicemix.executors.impl.ExecutorConfig#setAllowCoreThreadTimeOut(boolean)
  
      */
-    public void setAllowCoreThreadTimeout(boolean timeout) {
+    public void setAllowCoreThreadTimeOut(boolean timeout) {
         logger.debug("Setting core thread timeout allow: {}", timeout);
-        executorConfig.setAllowCoreThreadsTimeout(timeout);
+        executorConfig.setAllowCoreThreadTimeOut(timeout);
     }
 
     /**

Modified: 
servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java?rev=1086863&r1=1086862&r2=1086863&view=diff
==============================================================================
--- 
servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java
 (original)
+++ 
servicemix/components/trunk/shared-libraries/servicemix-common/src/test/java/org/apache/servicemix/common/osgi/ConfigurationTest.java
 Wed Mar 30 07:38:08 2011
@@ -34,7 +34,7 @@ public class ConfigurationTest extends T
         config.setCorePoolSize(10);
         config.setMaximumPoolSize(50);
         config.setQueueSize(100);
-        config.setAllowCoreThreadTimeout(false);
+        config.setAllowCoreThreadTimeOut(false);
         config.setKeepAliveTime(30000);
 
         ExecutorConfig executorConfig = config.getExecutorConfig();
@@ -42,7 +42,7 @@ public class ConfigurationTest extends T
         assertEquals(new Integer(10), executorConfig.getCorePoolSize());
         assertEquals(new Integer(50), executorConfig.getMaximumPoolSize());
         assertEquals(new Integer(100), executorConfig.getQueueSize());
-        assertFalse(executorConfig.isAllowCoreThreadsTimeout());
+        assertFalse(executorConfig.isAllowCoreThreadTimeOut());
         assertEquals(new Long(30000), executorConfig.getKeepAliveTime());
     }