You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2014/02/07 09:43:46 UTC
git commit: CAMEL-6365: Better use the IOHelper utility for closing
the Spring contexts.
Updated Branches:
refs/heads/master 989c964b0 -> d6a7b27d6
CAMEL-6365: Better use the IOHelper utility for closing the Spring contexts.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d6a7b27d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d6a7b27d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d6a7b27d
Branch: refs/heads/master
Commit: d6a7b27d623990f76e9c6a7417006807fa27aa9a
Parents: 989c964
Author: Babak Vahdat <bv...@apache.org>
Authored: Fri Feb 7 09:43:24 2014 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Fri Feb 7 09:43:24 2014 +0100
----------------------------------------------------------------------
.../apache/camel/component/cxf/CxfCustomerStartStopTest.java | 3 ++-
.../component/cxf/spring/AbstractSpringBeanTestSupport.java | 4 +++-
.../apache/camel/component/jms/JmsDestinationResolverTest.java | 3 ++-
.../camel/component/jms/JmsHeaderFilteringWithSpringTest.java | 5 ++---
.../org/apache/camel/component/jms/JmsRouteUsingSpringTest.java | 3 ++-
5 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d6a7b27d/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
index afd1878..2f5fc44 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomerStartStopTest.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.cxf;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.util.IOHelper;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine;
@@ -69,7 +70,7 @@ public class CxfCustomerStartStopTest extends Assert {
Bus bus = applicationContext.getBean("cxf", Bus.class);
// Bus shutdown will be called when the application context is closed.
String orig = System.setProperty("org.apache.cxf.transports.http_jetty.DontClosePort", "false");
- applicationContext.close();
+ IOHelper.close(applicationContext);
System.setProperty("org.apache.cxf.transports.http_jetty.DontClosePort",
orig == null ? "true" : "false");
JettyHTTPServerEngineFactory factory = bus.getExtension(JettyHTTPServerEngineFactory.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/d6a7b27d/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/AbstractSpringBeanTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/AbstractSpringBeanTestSupport.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/AbstractSpringBeanTestSupport.java
index 11f1d9c..9b0e82a 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/AbstractSpringBeanTestSupport.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/AbstractSpringBeanTestSupport.java
@@ -17,6 +17,8 @@
package org.apache.camel.component.cxf.spring;
+import org.apache.camel.util.IOHelper;
+
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -35,7 +37,7 @@ public abstract class AbstractSpringBeanTestSupport extends Assert {
@After
public void tearDown() throws Exception {
- ctx.close();
+ IOHelper.close(ctx);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d6a7b27d/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java
index d9d508b..8d85b60 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java
@@ -21,6 +21,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.IOHelper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -80,7 +81,7 @@ public class JmsDestinationResolverTest extends CamelTestSupport {
@After
public void tearDown() throws Exception {
super.tearDown();
- applicationContext.close();
+ IOHelper.close(applicationContext);
}
protected RouteBuilder createRouteBuilder() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/d6a7b27d/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringWithSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringWithSpringTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringWithSpringTest.java
index bc20175..9825ad1 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringWithSpringTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsHeaderFilteringWithSpringTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.util.IOHelper;
import org.junit.After;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -42,9 +43,7 @@ public class JmsHeaderFilteringWithSpringTest extends JmsHeaderFilteringTest {
@Override
@After
public void tearDown() throws Exception {
- if (applicationContext != null) {
- applicationContext.close();
- }
+ IOHelper.close(applicationContext);
super.tearDown();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d6a7b27d/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringTest.java
index db6b0dd..960d8a2 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingSpringTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.jms;
import org.apache.camel.CamelContext;
import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.util.IOHelper;
import org.junit.After;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -41,6 +42,6 @@ public class JmsRouteUsingSpringTest extends JmsRouteTest {
@After
public void tearDown() throws Exception {
super.tearDown();
- applicationContext.close();
+ IOHelper.close(applicationContext);
}
}