Repository: camel Updated Branches: refs/heads/camel-2.12.x b24ac9557 -> 415e51c89 refs/heads/master 44fb0b47c -> e052ed175
Avoid potential NPE from testing. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e052ed17 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e052ed17 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e052ed17 Branch: refs/heads/master Commit: e052ed1759b1a6369996c500d88bbe7aeeef2250 Parents: 44fb0b4 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Feb 24 18:28:50 2014 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Feb 24 18:41:51 2014 +0100 ---------------------------------------------------------------------- .../camel/component/solr/SolrComponentTestSupport.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e052ed17/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java index ff8f59a..c4b5522 100644 --- a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java +++ b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrComponentTestSupport.java @@ -75,7 +75,9 @@ public class SolrComponentTestSupport extends SolrTestSupport { @AfterClass public static void afterClass() throws Exception { - solrRunner.stop(); + if (solrRunner != null) { + solrRunner.stop(); + } } @Override @@ -96,8 +98,10 @@ public class SolrComponentTestSupport extends SolrTestSupport { @Before public void clearIndex() throws Exception { - // Clear the Solr index. - solrServer.deleteByQuery("*:*"); - solrServer.commit(); + if (solrServer != null) { + // Clear the Solr index. + solrServer.deleteByQuery("*:*"); + solrServer.commit(); + } } }
