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

Merge branch 'master' of github.com:spring-projects/sts4

Browse Source
This commit is contained in:
Kris De Volder
2017-02-01 11:18:30 -08:00
parent d4b0e89a50 86a9452de0
commit 47d8e1ee1f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFCallableContext.java
View File

@@ -19,6 +19,11 @@ import org.springframework.ide.vscode.commons.util.ExceptionUtil;
import reactor.ipc.netty.channel.AbortedException;
/**
* This is a stateful callable context that is "aware" of CF errors, and is not
* suitable for reuse as it may cache errors
*
*/
public class CFCallableContext {
private final CFParamsProviderMessages paramsProviderMessages;

9
vscode-extensions/commons/commons-cf/src/main/java/org/springframework/ide/vscode/commons/cloudfoundry/client/cftarget/CFTargetCache.java
View File

@@ -75,8 +75,8 @@ public class CFTargetCache {
if (target != null) {
// If any CF errors occurred in the target, refresh once
if (target.hasConnectionError()) {
cache.refresh(key);
target = cache.get(key);
cache.refresh(key);
target = cache.get(key);
}
targets.add(target);
}
@@ -87,6 +87,11 @@ public class CFTargetCache {
}
protected CFTarget create(CFClientParams params) throws Exception {
/*
* Must pass a NEW callable context. Cannot be
* the same as the target cache callable context, as
* contexts may contain error state
*/
return new CFTarget(getTargetName(params), params, clientFactory.getClient(params, timeouts),
new CFCallableContext(paramsProvider.getMessages()));
}