From 70eb6996419a33c93d403ceed1307bc5df515ee1 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Wed, 9 Sep 2020 16:04:09 +0000 Subject: [PATCH] change the java impl of the vm service protocol library to support new major protocol versions Change-Id: I0a954cbcf1103f999575f7d923037ae342f4256c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/162140 Reviewed-by: Ben Konyi Commit-Queue: Devon Carew --- pkg/dds/lib/dds.dart | 2 +- .../org/dartlang/vm/service/VmServiceBase.java | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/pkg/dds/lib/dds.dart b/pkg/dds/lib/dds.dart index aeb39a9c27b..f35e4d3fc27 100644 --- a/pkg/dds/lib/dds.dart +++ b/pkg/dds/lib/dds.dart @@ -114,7 +114,7 @@ abstract class DartDevelopmentService { /// Stop accepting requests after gracefully handling existing requests. Future shutdown(); - /// Set to `true` if this isntance of [DartDevelopmentService] requires an + /// Set to `true` if this instance of [DartDevelopmentService] requires an /// authentication code to connect. bool get authCodesEnabled; diff --git a/pkg/vm_service/java/src/org/dartlang/vm/service/VmServiceBase.java b/pkg/vm_service/java/src/org/dartlang/vm/service/VmServiceBase.java index c44b31da34a..207cdc59712 100644 --- a/pkg/vm_service/java/src/org/dartlang/vm/service/VmServiceBase.java +++ b/pkg/vm_service/java/src/org/dartlang/vm/service/VmServiceBase.java @@ -132,21 +132,6 @@ abstract class VmServiceBase implements VmServiceConst { @Override public void received(Version version) { - int major = version.getMajor(); - int minor = version.getMinor(); - if (major != VmService.versionMajor || minor != VmService.versionMinor) { - if (major == 2 || major == 3) { - Logging.getLogger().logInformation( - "Difference in protocol version: client=" + VmService.versionMajor + "." - + VmService.versionMinor + " vm=" + major + "." + minor); - } else { - String msg = "Incompatible protocol version: client=" + VmService.versionMajor + "." - + VmService.versionMinor + " vm=" + major + "." + minor; - Logging.getLogger().logError(msg); - errMsg[0] = msg; - } - } - vmService.runtimeVersion = version; latch.countDown();