From 9da5c627121c89303762a3da5b9249cebc6a5a0d Mon Sep 17 00:00:00 2001
From: Andrew Pielage <andrew.pielage@payara.fish>
Date: Wed, 3 Nov 2021 09:33:16 +0000
Subject: [PATCH] Merge pull request #5482 from Pandrex247/FISH-5829-FISH-5830

FISH-5829 FISH-5830 GMBAL 4.0.3 and PFL 4.1.2
---
 .../admin/gf_template/src/main/resources/config/domain.xml      | 2 ++
 .../admin/gf_template_web/src/main/resources/config/domain.xml  | 2 ++
 .../src/main/resources/config/domain.xml                        | 2 ++
 .../src/main/resources/config/domain.xml                        | 2 ++
 .../java/org/glassfish/admin/rest/composite/CompositeUtil.java  | 2 ++
 nucleus/packager/nucleus-corba-base/pom.xml                     | 1 +
 6 files changed, 11 insertions(+)

diff --git a/appserver/admin/gf_template/src/main/resources/config/domain.xml b/appserver/admin/gf_template/src/main/resources/config/domain.xml
index adb6261d82b..79651639607 100644
--- a/appserver/admin/gf_template/src/main/resources/config/domain.xml
+++ b/appserver/admin/gf_template/src/main/resources/config/domain.xml
@@ -319,6 +319,7 @@
                 <thread-pool name="http-thread-pool" max-queue-size="4096"></thread-pool>
                 <thread-pool name="thread-pool-1" max-thread-pool-size="200" />
             </thread-pools>
+            <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
         </config>
         <config name="default-config" dynamic-reconfiguration-enabled="true">
             <payara-executor-service-configuration />
@@ -585,6 +586,7 @@
             <system-property name="OSGI_SHELL_TELNET_PORT" value="26666" />
             <system-property name="JAVA_DEBUGGER_PORT" value="29009" />
             <system-property name="HZ_LISTENER_PORT" value="5900" />
+            <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
         </config>
     </configs>
     <property name="administrative.domain.name" value="%%%DOMAIN_NAME%%%" />
diff --git a/appserver/admin/gf_template_web/src/main/resources/config/domain.xml b/appserver/admin/gf_template_web/src/main/resources/config/domain.xml
index 9f59c89ac4f..2f4f795ab20 100644
--- a/appserver/admin/gf_template_web/src/main/resources/config/domain.xml
+++ b/appserver/admin/gf_template_web/src/main/resources/config/domain.xml
@@ -314,6 +314,7 @@
         <thread-pool name="http-thread-pool" max-queue-size="4096"></thread-pool>
         <thread-pool name="thread-pool-1" max-thread-pool-size="200" />
       </thread-pools>
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
     <config name="default-config" dynamic-reconfiguration-enabled="true">
       <http-service>
@@ -575,6 +576,7 @@
       <system-property name="OSGI_SHELL_TELNET_PORT" value="26666" />
       <system-property name="JAVA_DEBUGGER_PORT" value="29009" />
       <system-property name="HZ_LISTENER_PORT" value="5900" />
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
   </configs>
   <property name="administrative.domain.name" value="%%%DOMAIN_NAME%%%" />
diff --git a/appserver/admin/production_domain_template/src/main/resources/config/domain.xml b/appserver/admin/production_domain_template/src/main/resources/config/domain.xml
index 3f148440d97..77b89ccf0d7 100644
--- a/appserver/admin/production_domain_template/src/main/resources/config/domain.xml
+++ b/appserver/admin/production_domain_template/src/main/resources/config/domain.xml
@@ -271,6 +271,7 @@
       <system-property name="jersey.config.client.connectTimeout" value="300000" />
       <system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
       <system-property name="org.jboss.weld.probe.allowRemoteAddress" value="127.0.0.1|::1|::1%.+|0:0:0:0:0:0:0:1|0:0:0:0:0:0:0:1%.+" />
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
 
     <config name="default-config" dynamic-reconfiguration-enabled="true">
@@ -511,6 +512,7 @@
       <system-property name="HZ_LISTENER_PORT" value="5900" />
       <system-property name="fish.payara.classloading.delegate" value="false" />
       <system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
   </configs>
 
diff --git a/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml b/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml
index 0375bfae3c2..d9f0a1354a5 100644
--- a/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml
+++ b/appserver/admin/production_domain_template_web/src/main/resources/config/domain.xml
@@ -294,6 +294,7 @@
       <system-property name="jersey.config.client.connectTimeout" value="300000" />
       <system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
       <system-property name="org.jboss.weld.probe.allowRemoteAddress" value="127.0.0.1|::1|::1%.+|0:0:0:0:0:0:0:1|0:0:0:0:0:0:0:1%.+" />
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
     <config name="default-config" dynamic-reconfiguration-enabled="true">
       <http-service>
@@ -527,6 +528,7 @@
       <system-property name="HZ_LISTENER_PORT" value="5900" />
       <system-property name="fish.payara.classloading.delegate" value="false" />
       <system-property name="org.jboss.weld.clustering.rollingUpgradesIdDelimiter" value=".." />
+      <system-property name="org.glassfish.gmbal.no.multipleUpperBoundsException" value="true"/>
     </config>
   </configs>
   <property name="administrative.domain.name" value="%%%DOMAIN_NAME%%%" />
diff --git a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
index 2ef4110a78c..065567d9f19 100644
--- a/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
+++ b/nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/composite/CompositeUtil.java
@@ -42,6 +42,7 @@
 
 import com.sun.enterprise.util.LocalStringManagerImpl;
 import com.sun.enterprise.admin.report.ActionReporter;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -107,6 +108,7 @@
 import org.glassfish.jersey.media.sse.EventOutput;
 
 import static org.objectweb.asm.Opcodes.*;
+
 import org.jvnet.hk2.config.Attribute;
 import org.jvnet.hk2.config.MessageInterpolatorImpl;
 
diff --git a/nucleus/packager/nucleus-corba-base/pom.xml b/nucleus/packager/nucleus-corba-base/pom.xml
index cd58e7ce554..9beb55359a3 100644
--- a/nucleus/packager/nucleus-corba-base/pom.xml
+++ b/nucleus/packager/nucleus-corba-base/pom.xml
@@ -40,6 +40,7 @@
     holder.
 
 -->
+<!-- Portions Copyright 2021 Payara Foundation and/or its affiliates -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>