Skip to content

Commit

Permalink
Merge pull request #623 from fedinskiy/1.1.z
Browse files Browse the repository at this point in the history
Hash host and port to avoid reading them after shutdown
  • Loading branch information
Pablo Gonzalez Granados authored Dec 13, 2022
2 parents 50c5007 + 7974d84 commit b552352
Showing 1 changed file with 12 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ public abstract class OpenShiftQuarkusApplicationManagedResource<T extends Quark
private boolean init;
private boolean running;

private String host;
private int port = -1;

public OpenShiftQuarkusApplicationManagedResource(T model) {
super(model.getContext());
this.model = model;
Expand Down Expand Up @@ -76,15 +79,20 @@ public void stop() {
@Override
public String getHost(Protocol protocol) {
validateProtocol(protocol);
return untilIsNotNull(() -> client.url(model.getContext().getOwner()),
AwaitilitySettings.defaults().withService(getContext().getOwner()));
if (this.host == null) {
this.host = untilIsNotNull(() -> client.url(model.getContext().getOwner()),
AwaitilitySettings.defaults().withService(getContext().getOwner()));
}
return this.host;
}

@Override
public int getPort(Protocol protocol) {
int port = client.isServerlessService(model.getContext().getName()) ? EXTERNAL_SSL_PORT : EXTERNAL_PORT;
validateProtocol(protocol);
return port;
if (this.port == -1) {
this.port = client.isServerlessService(model.getContext().getName()) ? EXTERNAL_SSL_PORT : EXTERNAL_PORT;
}
return this.port;
}

@Override
Expand Down

0 comments on commit b552352

Please sign in to comment.