From ed56abed4e816788e1088fc74f40eee7b90b5fd0 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 16 Dec 2020 12:39:32 -0800 Subject: [PATCH] Allow more time to establish debug connection See: https://www.pivotaltracker.com/n/projects/1346850/stories/176156373 --- .../boot/dash/model/remote/RemoteJavaLaunchUtil.java | 7 +++++-- .../yaml/reconcile/SchemaBasedYamlASTReconciler.java | 3 --- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/remote/RemoteJavaLaunchUtil.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/remote/RemoteJavaLaunchUtil.java index 6e5955f4e..4c88eeb6c 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/remote/RemoteJavaLaunchUtil.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/remote/RemoteJavaLaunchUtil.java @@ -137,11 +137,14 @@ public class RemoteJavaLaunchUtil { for (ILaunch l : lm.getLaunches()) { if (conf.equals(l.getLaunchConfiguration())) { if (!l.isTerminated()) { - return null; + return l; } } }; - return RetryUtil.retry(50, 500, () -> conf.launch(ILaunchManager.DEBUG_MODE, new NullProgressMonitor(), false, true)); + ILaunch newLaunch = RetryUtil.retry(50, 1500, () -> + conf.launch(ILaunchManager.DEBUG_MODE, new NullProgressMonitor(), false, true) + ); + return newLaunch; } private static ILaunchConfiguration getLaunchConfig(GenericRemoteAppElement app) { diff --git a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java index 852908640..a2c37f512 100644 --- a/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java +++ b/headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java @@ -145,9 +145,6 @@ public class SchemaBasedYamlASTReconciler implements YamlASTReconciler { private void reconcile(YamlFileAST ast, YamlPath path, Node parent, Node node, YType _type) { nodeMerger.flattenMapping(node); -// System.out.println("--------- Reconciling ---------"); -// AstDumper.dump(node, 0); - if (_type!=null && !skipReconciling(node)) { DynamicSchemaContext schemaContext = new ASTDynamicSchemaContext(ast, path, node); YType type = typeUtil.inferMoreSpecificType(_type, schemaContext);