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 2012/09/10 14:44:48 UTC

svn commit: r1382802 - in /camel/trunk/components/camel-elasticsearch/src: main/java/org/apache/camel/component/elasticsearch/ test/java/org/apache/camel/component/elasticsearch/ test/resources/ test/resources/org/ test/resources/org/apache/ test/resou...

Author: bvahdat
Date: Mon Sep 10 12:44:47 2012
New Revision: 1382802

URL: http://svn.apache.org/viewvc?rev=1382802&view=rev
Log:
CAMEL-5586: Polished the camel-elasticsearch codebase.

Added:
    camel/trunk/components/camel-elasticsearch/src/test/resources/org/
    camel/trunk/components/camel-elasticsearch/src/test/resources/org/apache/
    camel/trunk/components/camel-elasticsearch/src/test/resources/org/apache/camel/
    camel/trunk/components/camel-elasticsearch/src/test/resources/org/apache/camel/component/
    camel/trunk/components/camel-elasticsearch/src/test/resources/org/apache/camel/component/elasticsearch/
    camel/trunk/components/camel-elasticsearch/src/test/resources/org/apache/camel/component/elasticsearch/SpringElasticsearchTest-context.xml
      - copied unchanged from r1382732, camel/trunk/components/camel-elasticsearch/src/test/resources/SpringElasticsearchTest.xml
Removed:
    camel/trunk/components/camel-elasticsearch/src/test/resources/SpringElasticsearchTest.xml
Modified:
    camel/trunk/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
    camel/trunk/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/SpringElasticsearchTest.java

Modified: camel/trunk/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java?rev=1382802&r1=1382801&r2=1382802&view=diff
==============================================================================
--- camel/trunk/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java (original)
+++ camel/trunk/components/camel-elasticsearch/src/main/java/org/apache/camel/component/elasticsearch/ElasticsearchEndpoint.java Mon Sep 10 12:44:47 2012
@@ -76,6 +76,7 @@ public class ElasticsearchEndpoint exten
         } else {
             LOG.info("Leaving ElasticSearch cluster " + config.getClusterName());
         }
+        client.close();
         node.close();
         super.doStop();
     }

Modified: camel/trunk/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/SpringElasticsearchTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/SpringElasticsearchTest.java?rev=1382802&r1=1382801&r2=1382802&view=diff
==============================================================================
--- camel/trunk/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/SpringElasticsearchTest.java (original)
+++ camel/trunk/components/camel-elasticsearch/src/test/java/org/apache/camel/component/elasticsearch/SpringElasticsearchTest.java Mon Sep 10 12:44:47 2012
@@ -27,7 +27,7 @@ import org.junit.Test;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
-@ContextConfiguration(locations = {"/SpringElasticsearchTest.xml"})
+@ContextConfiguration
 public class SpringElasticsearchTest extends AbstractJUnit4SpringContextTests {
 
     @Produce(uri = "direct:index")