Skip to content

Commit

Permalink
Fixes wrong detection message when seelcting a GF6.2 location.
Browse files Browse the repository at this point in the history
When adding a new server, after selecting "Glassfish Server" and
pressing next, when selecting an install location, the GUI searches for
a valid instance by comparing all possible instances (versions) with 
the one found in the location specified.

..modules.glassfish.common.wizardsServerWizardIterator::isValidInstall
..modules.glassfish.common.ServerDetails::isInstalledInDirectory

If the Glassfish version is 6.2, it shows it has found 6.1, but then 
goes on with the 6 version, as the 6.1 instance says it's 6.

org.netbeans.modules.glassfish.common.ServerDetails::getVersion

Now 6.1 says it's 610 and 6.0 says it's 600 as other versions do.
  • Loading branch information
nicolaken committed Aug 10, 2021
1 parent c0f4399 commit ff7779e
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ public enum ServerDetails {
*/
GLASSFISH_SERVER_6(NbBundle.getMessage(ServerDetails.class, "STR_6_SERVER_NAME", new Object[]{}), // NOI18N
"deployer:gfv6ee9", // NOI18N
6,
600,
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.0.0/glassfish-6.0.0.zip", // NOI18N
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.0.0/glassfish-6.0.0.zip", // NOI18N
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
Expand All @@ -220,7 +220,7 @@ public enum ServerDetails {
*/
GLASSFISH_SERVER_6_1_0(NbBundle.getMessage(ServerDetails.class, "STR_610_SERVER_NAME", new Object[]{}), // NOI18N
"deployer:gfv610ee9", // NOI18N
6,
610,
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.1.0/glassfish-6.1.0.zip", // NOI18N
"https://repo1.maven.org/maven2/org/glassfish/main/distributions/glassfish/6.1.0/glassfish-6.1.0.zip", // NOI18N
"http://www.eclipse.org/legal/epl-2.0" //NOI18N
Expand Down

0 comments on commit ff7779e

Please sign in to comment.