Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FISH-37 URL in DataSourceDefinition overrides serverName #4870

Merged
merged 3 commits into from
Sep 5, 2020

Conversation

Cousjava
Copy link
Contributor

@Cousjava Cousjava commented Sep 3, 2020

Description

This is a bug fix.

If URL has been set it should override the serverName, causing that to be set to null
to prevent that being using when the DataSource is initialised

Fixes #4385

Important Info

Testing

New tests

New test added in PR, DataSource Definition Tests

Testing Performed

  • Written test
  • Debugging Payara and checking the value of serverName is set to null and unused
  • Docker test in original issue

Testing Environment

Zulu JDK 1.8_262 on Ubuntu 20.04 with Maven 3.6.3

If URL has been set it should override the serverName, causing that to be set to null
to prevent that being using when the DataSource is initialised

Fixes payara#4385
@Cousjava Cousjava added this to the 5.2020.5 milestone Sep 3, 2020
@Cousjava Cousjava requested a review from Pandrex247 September 3, 2020 09:28
@Cousjava Cousjava requested a review from Pandrex247 September 4, 2020 10:27
@jGauravGupta
Copy link
Contributor

jenkins test please

@jGauravGupta jGauravGupta merged commit d9033e1 into payara:master Sep 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

faulty url in @DataSourceDefinition /FISH-37
3 participants