Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow more time to establish debug connection

Browse Source 
See: https://www.pivotaltracker.com/n/projects/1346850/stories/176156373
This commit is contained in:
Kris De Volder
2020-12-16 12:39:32 -08:00
parent c41db7c716
commit ed56abed4e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eclipse-extensions/org.springframework.ide.eclipse.boot.dash/src/org/springframework/ide/eclipse/boot/dash/model/remote/RemoteJavaLaunchUtil.java
View File

@@ -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) {

3
headless-services/commons/commons-yaml/src/main/java/org/springframework/ide/vscode/commons/yaml/reconcile/SchemaBasedYamlASTReconciler.java
View File

@@ -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);