From 6492e714c92189d75f48af9d5f1988e086524ca4 Mon Sep 17 00:00:00 2001
From: Antoine DESSAIGNE <antoine.dessaigne@gmail.com>
Date: Fri, 21 Jul 2017 14:35:56 +0200
Subject: [PATCH] CAMEL-11572 - Fix camel-lumberjack component lifecycle

---
 .../lumberjack/LumberjackConsumer.java        |  6 ++
 .../LumberjackComponentLifecycleTest.java     | 56 +++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java

diff --git a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
index 48c50107bc53d..5db821ea25380 100644
--- a/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
+++ b/components/camel-lumberjack/src/main/java/org/apache/camel/component/lumberjack/LumberjackConsumer.java
@@ -40,6 +40,12 @@ protected void doStart() throws Exception {
         lumberjackServer.start();
     }
 
+    @Override
+    protected void doStop() throws Exception {
+        lumberjackServer.stop();
+        super.doStop();
+    }
+
     @Override
     protected void doResume() throws Exception {
         super.doResume();
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
new file mode 100644
index 0000000000000..cbaed47941508
--- /dev/null
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackComponentLifecycleTest.java
@@ -0,0 +1,56 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.lumberjack;
+
+import org.apache.camel.ServiceStatus;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class LumberjackComponentLifecycleTest extends CamelTestSupport {
+    private static int port;
+
+    @BeforeClass
+    public static void beforeClass() {
+        port = AvailablePortFinder.getNextAvailable();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() {
+        return new RouteBuilder() {
+            public void configure() {
+                // Lumberjack configured with a specific port
+                from("lumberjack:0.0.0.0:" + port).to("mock:output");
+            }
+        };
+    }
+
+    @Test(timeout = 30_000)
+    public void shouldRestart() throws Exception {
+        // Given a started context
+        assertEquals(ServiceStatus.Started, context.getStatus());
+
+        // When restarting it
+        context.stop();
+        context.start();
+
+        // Then the context is started
+        assertEquals(ServiceStatus.Started, context.getStatus());
+    }
+}