You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/07/23 11:25:50 UTC
[1/3] git commit: CAMEL-6441: ServiceSupport when exception during
starting, then ensure clear flags to being stopped state.
Updated Branches:
refs/heads/master 5973e3fd3 -> 961c54fe5
CAMEL-6441: ServiceSupport when exception during starting, then ensure clear flags to being stopped state.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fdf27b46
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fdf27b46
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fdf27b46
Branch: refs/heads/master
Commit: fdf27b463db49f75227d3a94f30264826fde5afa
Parents: b2a4b54
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 23 11:22:12 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 23 11:22:12 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/support/ServiceSupport.java | 10 ++++++++++
.../java/org/apache/camel/support/ServiceSupportTest.java | 7 +++++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fdf27b46/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java b/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
index 85864c0..76515e6 100644
--- a/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/support/ServiceSupport.java
@@ -72,6 +72,16 @@ public abstract class ServiceSupport implements StatefulService {
stop();
} catch (Exception e2) {
// Ignore exceptions as we want to show the original exception
+ } finally {
+ // ensure flags get reset to stopped as we failed during starting
+ stopping.set(false);
+ stopped.set(true);
+ starting.set(false);
+ started.set(false);
+ suspending.set(false);
+ suspended.set(false);
+ shutdown.set(false);
+ shuttingdown.set(false);
}
throw e;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fdf27b46/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java b/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java
index 9d87389..efe8a04 100644
--- a/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java
+++ b/camel-core/src/test/java/org/apache/camel/support/ServiceSupportTest.java
@@ -93,6 +93,8 @@ public class ServiceSupportTest extends TestSupport {
public void testExceptionOnStart() throws Exception {
ServiceSupportTestExOnStart service = new ServiceSupportTestExOnStart();
+ // forced not being stopped at start
+ assertEquals(false, service.isStopped());
try {
service.start();
fail("RuntimeException expected");
@@ -106,6 +108,11 @@ public class ServiceSupportTest extends TestSupport {
public static class ServiceSupportTestExOnStart extends ServiceSupport {
+ public ServiceSupportTestExOnStart() {
+ // just for testing force it to not be stopped
+ stopped.set(false);
+ }
+
@Override
protected void doStart() throws Exception {
throw new RuntimeException("This service throws an exception when starting");
[3/3] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel
Posted by da...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/961c54fe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/961c54fe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/961c54fe
Branch: refs/heads/master
Commit: 961c54fe5f2254606c419d4c9a55e63557a01b66
Parents: 1cb4532 5973e3f
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 23 11:25:35 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 23 11:25:35 2013 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/file/GenericFileMessageTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: CAMEL-6476: Introducing StreamCachingStrategy SPI
to make it easier to configure and allow 3rd party to plugin custom
strategies.
Posted by da...@apache.org.
CAMEL-6476: Introducing StreamCachingStrategy SPI to make it easier to configure and allow 3rd party to plugin custom strategies.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1cb4532c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1cb4532c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1cb4532c
Branch: refs/heads/master
Commit: 1cb4532cb41768cd74ea3d0787e5d9f3bedcf7d0
Parents: fdf27b4
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jul 23 11:24:23 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jul 23 11:24:23 2013 +0200
----------------------------------------------------------------------
.../api/management/mbean/ManagedStreamCachingStrategyMBean.java | 2 +-
.../camel/management/mbean/ManagedStreamCachingStrategy.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1cb4532c/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedStreamCachingStrategyMBean.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedStreamCachingStrategyMBean.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedStreamCachingStrategyMBean.java
index 342dc7f..a576f81 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedStreamCachingStrategyMBean.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/ManagedStreamCachingStrategyMBean.java
@@ -40,7 +40,7 @@ public interface ManagedStreamCachingStrategyMBean {
void setSpoolUsedHeapMemoryThreshold(int percentage);
@ManagedAttribute(description = "Percentage (1-99) of used heap memory threshold to activate spooling to disk")
- long getSpoolUsedHeapMemoryThreshold();
+ int getSpoolUsedHeapMemoryThreshold();
@ManagedAttribute(description = "Buffer size in bytes to use when coping between buffers")
void setBufferSize(int bufferSize);
http://git-wip-us.apache.org/repos/asf/camel/blob/1cb4532c/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java
index a76e5dc..b57a010 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedStreamCachingStrategy.java
@@ -70,7 +70,7 @@ public class ManagedStreamCachingStrategy extends ManagedService implements Mana
streamCachingStrategy.setSpoolUsedHeapMemoryThreshold(percentage);
}
- public long getSpoolUsedHeapMemoryThreshold() {
+ public int getSpoolUsedHeapMemoryThreshold() {
return streamCachingStrategy.getSpoolUsedHeapMemoryThreshold();
}