Fixed hanging on testEnv.close when not started (#245)

Author: mfateev

src/main/java/com/uber/cadence/internal/sync/POJOActivityTaskHandler.java

@@ -60,6 +60,9 @@ public DataConverter getDataConverter() {
   }
 
   public void addActivityImplementation(Object activity) {
+    if (activity instanceof Class) {
+      throw new IllegalArgumentException("Activity object instance expected, not the class");
+    }
     Class<?> cls = activity.getClass();
     for (Method method : cls.getMethods()) {
       if (method.getAnnotation(ActivityMethod.class) != null) {

src/main/java/com/uber/cadence/internal/worker/WorkflowWorker.java

@@ -193,6 +193,9 @@ public void shutdownNow() {
 
   @Override
   public void awaitTermination(long timeout, TimeUnit unit) {
+    if (!poller.isStarted()) {
+      return;
+    }
     long timeoutMillis = unit.toMillis(timeout);
     timeoutMillis = InternalUtils.awaitTermination(poller, timeoutMillis);
     InternalUtils.awaitTermination(pollTaskExecutor, timeoutMillis);

src/test/java/com/uber/cadence/workflow/TestEnvironmentCloseTest.java

@@ -0,0 +1,68 @@
+/*
+ *  Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Modifications copyright (C) 2017 Uber Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"). You may not
+ *  use this file except in compliance with the License. A copy of the License is
+ *  located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ *  or in the "license" file accompanying this file. This file 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 com.uber.cadence.workflow;
+
+import static junit.framework.TestCase.assertTrue;
+
+import com.uber.cadence.activity.ActivityMethod;
+import com.uber.cadence.testing.TestWorkflowEnvironment;
+import com.uber.cadence.worker.Worker;
+import org.junit.Test;
+
+public class TestEnvironmentCloseTest {
+
+  public interface W {
+    @WorkflowMethod(executionStartToCloseTimeoutSeconds = 10, taskList = "WW")
+    void foo();
+
+    @SignalMethod
+    void signal();
+  }
+
+  public static class WW implements W {
+
+    @Override
+    public void foo() {}
+
+    @Override
+    public void signal() {}
+  }
+
+  public interface A {
+    @ActivityMethod
+    void bar();
+  }
+
+  public static class AA implements A {
+
+    @Override
+    public void bar() {}
+  }
+
+  @Test
+  public void testCloseNotHanging() throws InterruptedException {
+    TestWorkflowEnvironment env = TestWorkflowEnvironment.newInstance();
+    Worker worker = env.newWorker("WW");
+    worker.registerWorkflowImplementationTypes(WW.class);
+    worker.registerActivitiesImplementations(new AA());
+    long start = System.currentTimeMillis();
+    env.close();
+    long elapsed = System.currentTimeMillis() - start;
+    assertTrue(elapsed < 5000);
+  }
+}