Fix busy loop in local activity poller if there is no task (#337)

* Also fix an issue in get history timeout

Author: meiliang86

src/main/java/com/uber/cadence/internal/common/WorkflowExecutionUtils.java

@@ -196,6 +196,7 @@ public static HistoryEvent getInstanceCloseEvent(
       r.setExecution(workflowExecution);
       r.setHistoryEventFilterType(HistoryEventFilterType.CLOSE_EVENT);
       r.setNextPageToken(pageToken);
+      r.setWaitForNewEvent(true);
       try {
         response =
             Retryer.retryWithResult(retryParameters, () -> service.GetWorkflowExecutionHistory(r));

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

@@ -33,7 +33,11 @@ final class LocalActivityPollTask
 
   @Override
   public LocalActivityWorker.Task poll() throws TException {
-    return pendingTasks.poll();
+    try {
+      return pendingTasks.take();
+    } catch (InterruptedException e) {
+      throw new RuntimeException("local activity poll task interrupted", e);
+    }
   }
 
   @Override

src/main/java/com/uber/cadence/serviceclient/WorkflowServiceTChannel.java

@@ -808,10 +808,20 @@ private GetWorkflowExecutionHistoryResponse getWorkflowExecutionHistory(
       GetWorkflowExecutionHistoryRequest getRequest) throws TException {
     ThriftResponse<WorkflowService.GetWorkflowExecutionHistory_result> response = null;
     try {
-      ThriftRequest<WorkflowService.GetWorkflowExecutionHistory_args> request =
-          buildThriftRequest(
-              "GetWorkflowExecutionHistory",
-              new WorkflowService.GetWorkflowExecutionHistory_args(getRequest));
+      ThriftRequest<WorkflowService.GetWorkflowExecutionHistory_args> request;
+      if (getRequest.isWaitForNewEvent()) {
+        request =
+            buildThriftRequest(
+                "GetWorkflowExecutionHistory",
+                new WorkflowService.GetWorkflowExecutionHistory_args(getRequest),
+                options.getRpcLongPollTimeoutMillis());
+      } else {
+        request =
+            buildThriftRequest(
+                "GetWorkflowExecutionHistory",
+                new WorkflowService.GetWorkflowExecutionHistory_args(getRequest));
+      }
+
       response = doRemoteCall(request);
       WorkflowService.GetWorkflowExecutionHistory_result result =
           response.getBody(WorkflowService.GetWorkflowExecutionHistory_result.class);