Skip to content

Commit b5cfaa0

Browse files
committed
Merge branch 'fix-route-binding'
2 parents ea2c963 + 46eec70 commit b5cfaa0

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/DefaultApplications.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@
118118
import java.util.Map;
119119
import java.util.NoSuchElementException;
120120
import java.util.Optional;
121+
import java.util.concurrent.ThreadLocalRandom;
121122
import java.util.function.BiFunction;
122123
import java.util.function.Predicate;
123124
import java.util.function.UnaryOperator;
@@ -869,8 +870,8 @@ private static Flux<String> getPushRouteIdFromDomain(CloudFoundryClient cloudFou
869870
.map(ResourceUtils::getId)));
870871
}
871872

872-
private static Flux<String> getPushRouteIdFromRoute(CloudFoundryClient cloudFoundryClient, List<DomainSummary> availableDomains, ApplicationManifest manifest, String spaceId, RandomWords
873-
randomWords) {
873+
private static Flux<String> getPushRouteIdFromRoute(CloudFoundryClient cloudFoundryClient, List<DomainSummary> availableDomains, ApplicationManifest manifest, String spaceId,
874+
RandomWords randomWords) {
874875
return Flux.fromIterable(manifest.getRoutes())
875876
.flatMap(route -> RouteUtils.decomposeRoute(availableDomains, route.getRoute()))
876877
.flatMap(decomposedRoute -> {
@@ -1026,7 +1027,7 @@ private static Mono<Void> prepareDomainsAndRoutes(CloudFoundryClient cloudFoundr
10261027
}
10271028
} else {
10281029
return getPushRouteIdFromRoute(cloudFoundryClient, availableDomains, manifest, spaceId, randomWords)
1029-
.flatMap(routeId -> requestAssociateRoute(cloudFoundryClient, applicationId, routeId))
1030+
.flatMapSequential(routeId -> requestAssociateRoute(cloudFoundryClient, applicationId, routeId), 1)
10301031
.then();
10311032
}
10321033
}

0 commit comments

Comments
 (0)