Merge remote-tracking branch 'origin/main' into 2718-swift-ice-ami-fa…

…ilure
zeroc-ice · Oct 31, 2024 · 0bba38b · 0bba38b
2 parents 28091b1 + e5261ff
commit 0bba38b
Show file tree

Hide file tree

Showing 31 changed files with 216 additions and 119 deletions.
diff --git a/config/makeprops.py b/config/makeprops.py
@@ -273,9 +273,9 @@ def openFiles(self):
     {{
         const char* name;
         const bool prefixOnly;
+        const bool isOptIn;
         const Property* properties;
         const int length;
-        const bool isOptIn;
     }};
 
     class PropertyNames
@@ -330,9 +330,9 @@ def writePropertyArray(self, propertyArray):
 {{
     .name="{name}",
     .prefixOnly={prefixOnly},
+    .isOptIn={isOptIn},
     .properties={name}PropsData,
-    .length={len(propertyArray.properties)},
-    .isOptIn={isOptIn}
+    .length={len(propertyArray.properties)}
 }};
 
 """)
@@ -408,6 +408,7 @@ def fix(self, propertyName):
     def writePropertyArray(self, propertyArray):
         name = propertyArray.name
         prefixOnly = "true" if propertyArray.prefixOnly else "false"
+        isOptIn = "true" if propertyArray.isOptIn else "false"
         properties = (
             "\n            " + ",\n            ".join(propertyArray.properties)
             if propertyArray.properties
@@ -418,6 +419,7 @@ def writePropertyArray(self, propertyArray):
             f"""    public static final PropertyArray {name}Props = new PropertyArray(
         "{name}",
         {prefixOnly},
+        {isOptIn},
         new Property[] {{{properties}
         }});
 
@@ -505,6 +507,7 @@ def fix(self, propertyName):
     def writePropertyArray(self, propertyArray):
         name = propertyArray.name
         prefixOnly = "true" if propertyArray.prefixOnly else "false"
+        isOptIn = "true" if propertyArray.isOptIn else "false"
         properties = (
             f"\n            {",\n            ".join(propertyArray.properties)}\n        "
             if propertyArray.properties
@@ -515,6 +518,7 @@ def writePropertyArray(self, propertyArray):
     internal static PropertyArray {name}Props = new(
         "{name}",
         {prefixOnly},
+        {isOptIn},
         [{properties}]);
 
 """)
@@ -583,6 +587,7 @@ def fix(self, propertyName):
     def writePropertyArray(self, propertyArray):
         name = propertyArray.name
         prefixOnly = "true" if propertyArray.prefixOnly else "false"
+        isOptIn = "true" if propertyArray.isOptIn else "false"
         properties = (
             "\n    " + ",\n    ".join(propertyArray.properties)
             if propertyArray.properties
@@ -591,7 +596,7 @@ def writePropertyArray(self, propertyArray):
         # We assign the properties to the property array after creating it so that we can reference the array
         # in the properties themselves
         self.srcFile.write(f"""\
-PropertyNames.{name}Props = new PropertyArray("{name}", {prefixOnly});
+PropertyNames.{name}Props = new PropertyArray("{name}", {prefixOnly}, {isOptIn});
 PropertyNames.{name}Props.properties = [{properties}
 ];
 

diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -327,13 +327,13 @@ Ice::ObjectAdapterI::destroy() noexcept
         //
         // Remove object references (some of them cyclic).
         //
-        _instance = 0;
-        _threadPool = 0;
-        _routerInfo = 0;
+        _instance = nullptr;
+        _threadPool = nullptr;
+        _routerInfo = nullptr;
         _publishedEndpoints.clear();
-        _locatorInfo = 0;
-        _reference = 0;
-        _objectAdapterFactory = 0;
+        _locatorInfo = nullptr;
+        _reference = nullptr;
+        _objectAdapterFactory = nullptr;
 
         _state = StateDestroyed;
         _conditionVariable.notify_all();
@@ -582,7 +582,6 @@ optional<LocatorPrx>
 Ice::ObjectAdapterI::getLocator() const noexcept
 {
     lock_guard lock(_mutex);
-    checkForDeactivation();
     return _locatorInfo ? optional<LocatorPrx>(_locatorInfo->getLocator()) : nullopt;
 }
 

diff --git a/cpp/src/Ice/Properties.cpp b/cpp/src/Ice/Properties.cpp
@@ -603,7 +603,7 @@ Ice::Properties::parseOptions(string_view prefix, const StringSeq& options)
         }
         else
         {
-            unmatched.emplace_back(opt);
+            unmatched.push_back(std::move(opt));
         }
     }
 

diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
@@ -26,9 +26,9 @@ const PropertyArray PropertyNames::ProxyProps
 {
     .name="Proxy",
     .prefixOnly=false,
+    .isOptIn=false,
     .properties=ProxyPropsData,
-    .length=9,
-    .isOptIn=false
+    .length=9
 };
 
 const Property ConnectionPropsData[] =
@@ -45,9 +45,9 @@ const PropertyArray PropertyNames::ConnectionProps
 {
     .name="Connection",
     .prefixOnly=true,
+    .isOptIn=false,
     .properties=ConnectionPropsData,
-    .length=6,
-    .isOptIn=false
+    .length=6
 };
 
 const Property ThreadPoolPropsData[] =
@@ -63,9 +63,9 @@ const PropertyArray PropertyNames::ThreadPoolProps
 {
     .name="ThreadPool",
     .prefixOnly=true,
+    .isOptIn=false,
     .properties=ThreadPoolPropsData,
-    .length=5,
-    .isOptIn=false
+    .length=5
 };
 
 const Property ObjectAdapterPropsData[] =
@@ -88,9 +88,9 @@ const PropertyArray PropertyNames::ObjectAdapterProps
 {
     .name="ObjectAdapter",
     .prefixOnly=true,
+    .isOptIn=false,
     .properties=ObjectAdapterPropsData,
-    .length=12,
-    .isOptIn=false
+    .length=12
 };
 
 const Property LMDBPropsData[] =
@@ -103,9 +103,9 @@ const PropertyArray PropertyNames::LMDBProps
 {
     .name="LMDB",
     .prefixOnly=true,
+    .isOptIn=false,
     .properties=LMDBPropsData,
-    .length=2,
-    .isOptIn=false
+    .length=2
 };
 
 const Property IcePropsData[] =
@@ -199,9 +199,9 @@ const PropertyArray PropertyNames::IceProps
 {
     .name="Ice",
     .prefixOnly=false,
+    .isOptIn=false,
     .properties=IcePropsData,
-    .length=83,
-    .isOptIn=false
+    .length=83
 };
 
 const Property IceMXPropsData[] =
@@ -218,9 +218,9 @@ const PropertyArray PropertyNames::IceMXProps
 {
     .name="IceMX",
     .prefixOnly=false,
+    .isOptIn=false,
     .properties=IceMXPropsData,
-    .length=6,
-    .isOptIn=false
+    .length=6
 };
 
 const Property IceDiscoveryPropsData[] =
@@ -242,9 +242,9 @@ const PropertyArray PropertyNames::IceDiscoveryProps
 {
     .name="IceDiscovery",
     .prefixOnly=false,
+    .isOptIn=false,
     .properties=IceDiscoveryPropsData,
-    .length=11,
-    .isOptIn=false
+    .length=11
 };
 
 const Property IceLocatorDiscoveryPropsData[] =
@@ -266,9 +266,9 @@ const PropertyArray PropertyNames::IceLocatorDiscoveryProps
 {
     .name="IceLocatorDiscovery",
     .prefixOnly=false,
+    .isOptIn=false,
     .properties=IceLocatorDiscoveryPropsData,
-    .length=11,
-    .isOptIn=false
+    .length=11
 };
 
 const Property IceBoxPropsData[] =
@@ -285,9 +285,9 @@ const PropertyArray PropertyNames::IceBoxProps
 {
     .name="IceBox",
     .prefixOnly=false,
+    .isOptIn=true,
     .properties=IceBoxPropsData,
-    .length=6,
-    .isOptIn=true
+    .length=6
 };
 
 const Property IceBoxAdminPropsData[] =
@@ -299,9 +299,9 @@ const PropertyArray PropertyNames::IceBoxAdminProps
 {
     .name="IceBoxAdmin",
     .prefixOnly=false,
+    .isOptIn=true,
     .properties=IceBoxAdminPropsData,
-    .length=1,
-    .isOptIn=true
+    .length=1
 };
 
 const Property IceBridgePropsData[] =
@@ -315,9 +315,9 @@ const PropertyArray PropertyNames::IceBridgeProps
 {
     .name="IceBridge",
     .prefixOnly=false,
+    .isOptIn=true,
     .properties=IceBridgePropsData,
-    .length=3,
-    .isOptIn=true
+    .length=3
 };
 
 const Property IceGridAdminPropsData[] =
@@ -341,9 +341,9 @@ const PropertyArray PropertyNames::IceGridAdminProps
 {
     .name="IceGridAdmin",
     .prefixOnly=false,
+    .isOptIn=true,
     .properties=IceGridAdminPropsData,
-    .length=13,
-    .isOptIn=true
+    .length=13
 };
 
 const Property IceGridPropsData[] =
@@ -416,9 +416,9 @@ const PropertyArray PropertyNames::IceGridProps
 {
     .name="IceGrid",
     .prefixOnly=false,
+    .isOptIn=true,
     .properties=IceGridPropsData,
-    .length=62,
-    .isOptIn=true
+    .length=62
 };
 
 const Property IceSSLPropsData[] =
@@ -450,9 +450,9 @@ const PropertyArray PropertyNames::IceSSLProps
 {
     .name="IceSSL",
     .prefixOnly=false,
+    .isOptIn=false,
     .properties=IceSSLPropsData,
-    .length=21,
-    .isOptIn=false
+    .length=21
 };
 
 const Property IceStormPropsData[] =
@@ -487,9 +487,9 @@ const PropertyArray PropertyNames::IceStormProps
 {
     .name="IceStorm",
     .prefixOnly=false,
+    .isOptIn=true,
     .properties=IceStormPropsData,
-    .length=24,
-    .isOptIn=true
+    .length=24
 };
 
 const Property IceStormAdminPropsData[] =
@@ -503,9 +503,9 @@ const PropertyArray PropertyNames::IceStormAdminProps
 {
     .name="IceStormAdmin",
     .prefixOnly=false,
+    .isOptIn=true,
     .properties=IceStormAdminPropsData,
-    .length=3,
-    .isOptIn=true
+    .length=3
 };
 
 const Property IceBTPropsData[] =
@@ -518,9 +518,9 @@ const PropertyArray PropertyNames::IceBTProps
 {
     .name="IceBT",
     .prefixOnly=false,
+    .isOptIn=false,
     .properties=IceBTPropsData,
-    .length=2,
-    .isOptIn=false
+    .length=2
 };
 
 const Property Glacier2PropsData[] =
@@ -555,9 +555,9 @@ const PropertyArray PropertyNames::Glacier2Props
 {
     .name="Glacier2",
     .prefixOnly=false,
+    .isOptIn=true,
     .properties=Glacier2PropsData,
-    .length=24,
-    .isOptIn=true
+    .length=24
 };
 
 const Property DataStormPropsData[] =
@@ -581,9 +581,9 @@ const PropertyArray PropertyNames::DataStormProps
 {
     .name="DataStorm",
     .prefixOnly=false,
+    .isOptIn=true,
     .properties=DataStormPropsData,
-    .length=13,
-    .isOptIn=true
+    .length=13
 };
 
 const std::array<PropertyArray, 15> PropertyNames::validProps =

diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
@@ -29,9 +29,9 @@ namespace IceInternal
     {
         const char* name;
         const bool prefixOnly;
+        const bool isOptIn;
         const Property* properties;
         const int length;
-        const bool isOptIn;
     };
 
     class PropertyNames

diff --git a/cpp/test/IceBox/configuration/config.icebox2 b/cpp/test/IceBox/configuration/config.icebox2
@@ -3,7 +3,6 @@ Ice.Admin.Endpoints=default -p 9996 -h 127.0.0.1
 Ice.ProgramName=IceBox2
 
 IceBox.InheritProperties=1
-
 TestInheritProperties=1
 
 ServerProp=1

diff --git a/csharp/src/Ice/Internal/Property.cs b/csharp/src/Ice/Internal/Property.cs
@@ -4,7 +4,7 @@
 
 namespace Ice.Internal;
 
-internal sealed record class PropertyArray(string name, bool prefixOnly, Property[] properties);
+internal sealed record class PropertyArray(string name, bool prefixOnly, bool isOptIn, Property[] properties);
 
 internal sealed record class Property(
     string pattern,