[beam] branch master updated: Revert "Fix state handler for missing service descriptor."

[ib...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ibzib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new f5f241a  Revert "Fix state handler for missing service descriptor."
     new 9f6e26f  Merge pull request #12040 from ibzib/BEAM-9852
f5f241a is described below

commit f5f241a254d623ef11153bd1381c9edc4af99d4a
Author: Kyle Weaver <kc...@google.com>
AuthorDate: Fri Jun 19 10:58:18 2020 -0700

    Revert "Fix state handler for missing service descriptor."
    
    This reverts commit e7833d64df6576cb3105a455db78b219dbd4dfef.
---
 sdks/python/apache_beam/runners/worker/sdk_worker.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdks/python/apache_beam/runners/worker/sdk_worker.py b/sdks/python/apache_beam/runners/worker/sdk_worker.py
index 9fba939..a58dd2f 100644
--- a/sdks/python/apache_beam/runners/worker/sdk_worker.py
+++ b/sdks/python/apache_beam/runners/worker/sdk_worker.py
@@ -55,7 +55,6 @@ from apache_beam.coders import coder_impl
 from apache_beam.metrics import monitoring_infos
 from apache_beam.portability.api import beam_fn_api_pb2
 from apache_beam.portability.api import beam_fn_api_pb2_grpc
-from apache_beam.portability.api import endpoints_pb2
 from apache_beam.portability.api import metrics_pb2
 from apache_beam.runners.worker import bundle_processor
 from apache_beam.runners.worker import data_plane
@@ -68,6 +67,7 @@ from apache_beam.runners.worker.worker_status import FnApiWorkerStatusHandler
 from apache_beam.utils import thread_pool_executor
 
 if TYPE_CHECKING:
+  from apache_beam.portability.api import endpoints_pb2
   from apache_beam.utils.profiler import Profile
 
 _LOGGER = logging.getLogger(__name__)
@@ -688,7 +688,7 @@ class GrpcStateHandlerFactory(StateHandlerFactory):
 
   def create_state_handler(self, api_service_descriptor):
     # type: (endpoints_pb2.ApiServiceDescriptor) -> CachingStateHandler
-    if api_service_descriptor == endpoints_pb2.ApiServiceDescriptor():
+    if not api_service_descriptor:
       return self._throwing_state_handler
     url = api_service_descriptor.url
     if url not in self._state_handler_cache: