Merge pull request #7182 from Viii3/FISH-8459-Grizzly-4.0.2

FISH-8459 Update Grizzly to patched 4.0.2
payara · Feb 10, 2025 · a8ef30a · a8ef30a
2 parents dc36737 + 96775a5
commit a8ef30a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -66,7 +66,7 @@
         <osgi.dto.version>1.1.1</osgi.dto.version>
         <jakarta.security.enterprise.version>3.0.3.payara-p1</jakarta.security.enterprise.version>
         <cdi-api.version>4.0.1</cdi-api.version>
-        <grizzly.version>4.0.0.payara-p2</grizzly.version>
+        <grizzly.version>4.0.2.payara-p1</grizzly.version>
         <servlet-api.version>6.0.0</servlet-api.version>
         <jakarta.el-api.version>5.0.1</jakarta.el-api.version>
         <expressly.version>5.0.0</expressly.version>

diff --git a/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java b/nucleus/grizzly/config/src/main/java/org/glassfish/grizzly/config/SSLConfigurator.java
@@ -139,8 +139,8 @@ public SSLImplementation get() {
         }
 
         sslImplementation = sslImplementationLocal;
-        needClientAuth = isNeedClientAuth(ssl);
-        wantClientAuth = isWantClientAuth(ssl);
+        setNeedClientAuth(isNeedClientAuth(ssl));
+        setWantClientAuth(isWantClientAuth(ssl));
         clientMode = false;
         sslContextConfiguration = new InternalSSLContextConfigurator();
     }
@@ -187,7 +187,7 @@ protected SSLContext configureSSL() {
                 } else {
                     final String[] protocols = new String[tmpSSLArtifactsList.size()];
                     tmpSSLArtifactsList.toArray(protocols);
-                    enabledProtocols = protocols;
+                    setEnabledProtocols(protocols);
                 }
 //                String auth = ssl.getClientAuth();
 //                if (auth != null) {
@@ -211,14 +211,14 @@ protected SSLContext configureSSL() {
                     logEmptyWarning(ssl, "WEB0308: All SSL cipher suites disabled for network-listener(s) {0}."
                             + "  Using SSL implementation specific defaults");
                 } else {
-                    enabledCipherSuites = ciphers;
+                    setEnabledCipherSuites(ciphers);
                 }
             }
 
             if (LOGGER.isLoggable(Level.FINE)) {
                 LOGGER.log(Level.FINE, "Enabled secure protocols={0}"
                         + "" + " ciphers={1}", new Object[]
-                        {Arrays.toString(enabledProtocols), Arrays.toString(enabledCipherSuites)});
+                        {Arrays.toString(getEnabledProtocols()), Arrays.toString(getEnabledCipherSuites())});
             }
 
             return newSslContext;