From bc73488cbe548522a291b14e78fa3902bb6b0563 Mon Sep 17 00:00:00 2001 From: Bjorn Melinder Date: Sun, 2 Jun 2019 08:09:19 +0200 Subject: [PATCH 1/2] [#2486] Re-enable remote JPDA debugging in Java 11. --- framework/pym/play/application.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/framework/pym/play/application.py b/framework/pym/play/application.py index 1b70ef905a..bdf27d2683 100644 --- a/framework/pym/play/application.py +++ b/framework/pym/play/application.py @@ -221,7 +221,9 @@ def log_path(self): def check_jpda(self): try: s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.bind(('', int(self.jpda_port))) + jpda_parts = self.jpda_port.split(':') + port = jpda_parts[-1] + s.bind(('', int(port))) s.close() except socket.error, e: if "disable_random_jpda" in self.play_env and self.play_env["disable_random_jpda"]: From b13f796a0c98a1015f01420252112a0e216286b9 Mon Sep 17 00:00:00 2001 From: Bjorn Melinder Date: Tue, 18 Jun 2019 11:11:22 +0200 Subject: [PATCH 2/2] Fixed failing test. --- framework/pym/play/application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/pym/play/application.py b/framework/pym/play/application.py index bdf27d2683..fa6379a8a6 100644 --- a/framework/pym/play/application.py +++ b/framework/pym/play/application.py @@ -221,7 +221,7 @@ def log_path(self): def check_jpda(self): try: s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - jpda_parts = self.jpda_port.split(':') + jpda_parts = str(self.jpda_port).split(':') port = jpda_parts[-1] s.bind(('', int(port))) s.close()