(HEAD:zeroc-ice/ice@42214d433f) RedHat multi-platform build fixes (ze…

…roc-ice/ice#3169)

slice2cpp/slice/IceBox/ServiceManager.cpp

@@ -150,11 +150,11 @@ IceBox::ServiceManagerPrx::_iceI_startService(const ::std::shared_ptr<::IceInter
             {
                 ex.ice_throw();
             }
-            catch(const AlreadyStartedException&)
+            catch(const NoSuchServiceException&)
             {
                 throw;
             }
-            catch(const NoSuchServiceException&)
+            catch(const AlreadyStartedException&)
             {
                 throw;
             }

slice2cs/cpp/src/IceGrid/Internal.cs

@@ -5521,11 +5521,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_adapterId, string iceP_repl
                     {
                         throw ex;
                     }
-                    catch(AdapterNotExistException)
+                    catch(AdapterExistsException)
                     {
                         throw;
                     }
-                    catch(AdapterExistsException)
+                    catch(AdapterNotExistException)
                     {
                         throw;
                     }
@@ -5924,11 +5924,11 @@ private void _iceI_registerNode(InternalNodeInfo? iceP_info, NodePrx? iceP_prx,
                     {
                         throw ex;
                     }
-                    catch(PermissionDeniedException)
+                    catch(NodeActiveException)
                     {
                         throw;
                     }
-                    catch(NodeActiveException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }
@@ -5980,11 +5980,11 @@ private void _iceI_registerReplica(InternalReplicaInfo? iceP_info, InternalRegis
                     {
                         throw ex;
                     }
-                    catch(PermissionDeniedException)
+                    catch(ReplicaActiveException)
                     {
                         throw;
                     }
-                    catch(ReplicaActiveException)
+                    catch(PermissionDeniedException)
                     {
                         throw;
                     }

slice2cs/csharp/test/Ice/operations/TestAMD.cs

@@ -9868,6 +9868,8 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyStruct1> opMyStruct1Async(MyStruct1 opMyStruct1, Ice.Current current);
 
+            public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
+
             public abstract global::System.Threading.Tasks.Task<bool> supportsCompressAsync(Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task opVoidAsync(Ice.Current current);
@@ -9878,8 +9880,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongResult> opShortIntLongAsync(short p1, int p2, long p3, Ice.Current current);
 
-            public abstract global::System.Threading.Tasks.Task shutdownAsync(Ice.Current current);
-
             public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleResult> opFloatDoubleAsync(float p1, double p2, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpStringResult> opStringAsync(string p1, string p2, Ice.Current current);
@@ -9892,6 +9892,10 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpByteSResult> opByteSAsync(byte[] p1, byte[] p2, Ice.Current current);
 
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current);
+
+            public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);
+
             public abstract global::System.Threading.Tasks.Task<MyClass_OpFloatDoubleSResult> opFloatDoubleSAsync(float[] p1, double[] p2, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpStringSResult> opStringSAsync(string[] p1, string[] p2, Ice.Current current);
@@ -9910,10 +9914,6 @@ public abstract class MyDerivedClassDisp_ : Ice.ObjectImpl, MyDerivedClass
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpByteBoolDResult> opByteBoolDAsync(global::System.Collections.Generic.Dictionary<byte, bool> p1, global::System.Collections.Generic.Dictionary<byte, bool> p2, Ice.Current current);
 
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpBoolSResult> opBoolSAsync(bool[] p1, bool[] p2, Ice.Current current);
-
-            public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntLongSResult> opShortIntLongSAsync(short[] p1, int[] p2, long[] p3, Ice.Current current);
-
             public abstract global::System.Threading.Tasks.Task<MyClass_OpShortIntDResult> opShortIntDAsync(global::System.Collections.Generic.Dictionary<short, int> p1, global::System.Collections.Generic.Dictionary<short, int> p2, Ice.Current current);
 
             public abstract global::System.Threading.Tasks.Task<MyClass_OpLongFloatDResult> opLongFloatDAsync(global::System.Collections.Generic.Dictionary<long, float> p1, global::System.Collections.Generic.Dictionary<long, float> p2, Ice.Current current);

slice2cs/ruby/test/Ice/location/Test.cs

@@ -186,11 +186,11 @@ private void _iceI_setAdapterDirectProxy(string iceP_id, global::Ice.ObjectPrx?
                     {
                         throw ex;
                     }
-                    catch(global::Ice.AdapterAlreadyActiveException)
+                    catch(global::Ice.AdapterNotFoundException)
                     {
                         throw;
                     }
-                    catch(global::Ice.AdapterNotFoundException)
+                    catch(global::Ice.AdapterAlreadyActiveException)
                     {
                         throw;
                     }
@@ -236,15 +236,15 @@ private void _iceI_setReplicatedAdapterDirectProxy(string iceP_adapterId, string
                     {
                         throw ex;
                     }
-                    catch(global::Ice.InvalidReplicaGroupIdException)
+                    catch(global::Ice.AdapterNotFoundException)
                     {
                         throw;
                     }
-                    catch(global::Ice.AdapterAlreadyActiveException)
+                    catch(global::Ice.InvalidReplicaGroupIdException)
                     {
                         throw;
                     }
-                    catch(global::Ice.AdapterNotFoundException)
+                    catch(global::Ice.AdapterAlreadyActiveException)
                     {
                         throw;
                     }

slice2java/cpp/src/DataStorm/DataStormContract/DataSample.java

@@ -224,5 +224,5 @@ static public java.util.Optional<DataSample> ice_read(com.zeroc.Ice.InputStream
     private static final DataSample _nullMarshalValue = new DataSample();
 
     /** @hidden */
-    private static final long serialVersionUID = -2004457903365208066L;
+    private static final long serialVersionUID = -7148730518289522987L;
 }

slice2java/cpp/src/DataStorm/DataStormContract/DataSamples.java

@@ -155,5 +155,5 @@ static public java.util.Optional<DataSamples> ice_read(com.zeroc.Ice.InputStream
     private static final DataSamples _nullMarshalValue = new DataSamples();
 
     /** @hidden */
-    private static final long serialVersionUID = -5577050915105203878L;
+    private static final long serialVersionUID = -494851609282195701L;
 }

slice2java/cpp/src/DataStorm/DataStormContract/ElementConfig.java

@@ -424,7 +424,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -3961881929226884986L;
+    private static final long serialVersionUID = 1507061936258265852L;
 
     /** @hidden */
     @Override

slice2java/cpp/src/DataStorm/DataStormContract/ElementData.java

@@ -174,5 +174,5 @@ static public java.util.Optional<ElementData> ice_read(com.zeroc.Ice.InputStream
     private static final ElementData _nullMarshalValue = new ElementData();
 
     /** @hidden */
-    private static final long serialVersionUID = 7859619215011069752L;
+    private static final long serialVersionUID = -4284577807096313438L;
 }

slice2java/cpp/src/DataStorm/DataStormContract/ElementDataAck.java

@@ -200,5 +200,5 @@ static public java.util.Optional<ElementDataAck> ice_read(com.zeroc.Ice.InputStr
     private static final ElementDataAck _nullMarshalValue = new ElementDataAck();
 
     /** @hidden */
-    private static final long serialVersionUID = 5108687161682778226L;
+    private static final long serialVersionUID = -3542590017335606759L;
 }

slice2java/cpp/src/DataStorm/DataStormContract/ElementInfo.java

@@ -172,5 +172,5 @@ static public java.util.Optional<ElementInfo> ice_read(com.zeroc.Ice.InputStream
     private static final ElementInfo _nullMarshalValue = new ElementInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -354161950524300988L;
+    private static final long serialVersionUID = -4310365953351834408L;
 }

slice2java/cpp/src/DataStorm/DataStormContract/ElementSpec.java

@@ -215,5 +215,5 @@ static public java.util.Optional<ElementSpec> ice_read(com.zeroc.Ice.InputStream
     private static final ElementSpec _nullMarshalValue = new ElementSpec();
 
     /** @hidden */
-    private static final long serialVersionUID = 2746108234682905028L;
+    private static final long serialVersionUID = 4455385281233960700L;
 }

slice2java/cpp/src/DataStorm/DataStormContract/ElementSpecAck.java

@@ -215,5 +215,5 @@ static public java.util.Optional<ElementSpecAck> ice_read(com.zeroc.Ice.InputStr
     private static final ElementSpecAck _nullMarshalValue = new ElementSpecAck();
 
     /** @hidden */
-    private static final long serialVersionUID = -2802720719193131830L;
+    private static final long serialVersionUID = 7954515353669077754L;
 }

slice2java/cpp/src/DataStorm/DataStormContract/FilterInfo.java

@@ -153,5 +153,5 @@ static public java.util.Optional<FilterInfo> ice_read(com.zeroc.Ice.InputStream
     private static final FilterInfo _nullMarshalValue = new FilterInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 6499178522850816502L;
+    private static final long serialVersionUID = 8535663660358192201L;
 }

slice2java/cpp/src/DataStorm/DataStormContract/TopicInfo.java

@@ -159,5 +159,5 @@ static public java.util.Optional<TopicInfo> ice_read(com.zeroc.Ice.InputStream i
     private static final TopicInfo _nullMarshalValue = new TopicInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 7889463203428758612L;
+    private static final long serialVersionUID = -6397851842842099367L;
 }

slice2java/cpp/src/DataStorm/DataStormContract/TopicSpec.java

@@ -185,5 +185,5 @@ static public java.util.Optional<TopicSpec> ice_read(com.zeroc.Ice.InputStream i
     private static final TopicSpec _nullMarshalValue = new TopicSpec();
 
     /** @hidden */
-    private static final long serialVersionUID = -186128168391674319L;
+    private static final long serialVersionUID = 7380465135417149572L;
 }

slice2java/cpp/src/IceGrid/IceGrid/AdapterExistsException.java

@@ -56,5 +56,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3774317193927409948L;
+    private static final long serialVersionUID = 3774321269731457198L;
 }

slice2java/cpp/src/IceGrid/IceGrid/AdapterNotActiveException.java

@@ -55,5 +55,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 7872703495623158625L;
+    private static final long serialVersionUID = 7872702111119878328L;
 }

slice2java/cpp/src/IceGrid/IceGrid/InternalAdapterDescriptor.java

@@ -55,7 +55,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 594022330285831986L;
+    private static final long serialVersionUID = -380946162175864615L;
 
     /** @hidden */
     @Override

slice2java/cpp/src/IceGrid/IceGrid/InternalDbEnvDescriptor.java

@@ -55,7 +55,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -5063840936401403627L;
+    private static final long serialVersionUID = 1367202583304267491L;
 
     /** @hidden */
     @Override

slice2java/cpp/src/IceGrid/IceGrid/InternalNodeInfo.java

@@ -196,7 +196,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 3247686098562578888L;
+    private static final long serialVersionUID = -8786943976138952846L;
 
     /** @hidden */
     @Override

slice2java/cpp/src/IceGrid/IceGrid/InternalReplicaInfo.java

@@ -59,7 +59,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 8944127105771955516L;
+    private static final long serialVersionUID = -6023433749593590020L;
 
     /** @hidden */
     @Override

slice2java/cpp/src/IceGrid/IceGrid/InternalServerDescriptor.java

@@ -272,7 +272,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 4445893790968470316L;
+    private static final long serialVersionUID = -1257166433704442345L;
 
     /** @hidden */
     @Override

slice2java/cpp/src/IceStorm/IceStorm/AllData.java

@@ -155,5 +155,5 @@ static public java.util.Optional<AllData> ice_read(com.zeroc.Ice.InputStream ist
     private static final AllData _nullMarshalValue = new AllData();
 
     /** @hidden */
-    private static final long serialVersionUID = -1960902246241915721L;
+    private static final long serialVersionUID = -313902791270600425L;
 }

slice2java/cpp/src/IceStorm/IceStorm/EventData.java

@@ -195,5 +195,5 @@ static public java.util.Optional<EventData> ice_read(com.zeroc.Ice.InputStream i
     private static final EventData _nullMarshalValue = new EventData();
 
     /** @hidden */
-    private static final long serialVersionUID = 4291816882296087093L;
+    private static final long serialVersionUID = 1383657461710764116L;
 }

slice2java/cpp/src/IceStorm/IceStorm/LinkRecord.java

@@ -177,5 +177,5 @@ static public java.util.Optional<LinkRecord> ice_read(com.zeroc.Ice.InputStream
     private static final LinkRecord _nullMarshalValue = new LinkRecord();
 
     /** @hidden */
-    private static final long serialVersionUID = -3302313479959552548L;
+    private static final long serialVersionUID = 5017833574612552467L;
 }

slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecord.java

@@ -240,5 +240,5 @@ static public java.util.Optional<SubscriberRecord> ice_read(com.zeroc.Ice.InputS
     private static final SubscriberRecord _nullMarshalValue = new SubscriberRecord();
 
     /** @hidden */
-    private static final long serialVersionUID = -870393169378783758L;
+    private static final long serialVersionUID = 1865804894705577238L;
 }

slice2java/cpp/src/IceStorm/IceStorm/SubscriberRecordKey.java

@@ -168,5 +168,5 @@ static public java.util.Optional<SubscriberRecordKey> ice_read(com.zeroc.Ice.Inp
     private static final SubscriberRecordKey _nullMarshalValue = new SubscriberRecordKey();
 
     /** @hidden */
-    private static final long serialVersionUID = 8998566020199341343L;
+    private static final long serialVersionUID = 3398868022719983839L;
 }

slice2java/cpp/src/IceStorm/IceStormElection/GroupInfo.java

@@ -161,5 +161,5 @@ static public java.util.Optional<GroupInfo> ice_read(com.zeroc.Ice.InputStream i
     private static final GroupInfo _nullMarshalValue = new GroupInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = -1225569543259094081L;
+    private static final long serialVersionUID = -2952468980048936300L;
 }

slice2java/cpp/src/IceStorm/IceStormElection/LogUpdate.java

@@ -157,5 +157,5 @@ static public java.util.Optional<LogUpdate> ice_read(com.zeroc.Ice.InputStream i
     private static final LogUpdate _nullMarshalValue = new LogUpdate();
 
     /** @hidden */
-    private static final long serialVersionUID = 705809845220870852L;
+    private static final long serialVersionUID = -3950062066412608604L;
 }

slice2java/cpp/src/IceStorm/IceStormElection/NodeInfo.java

@@ -161,5 +161,5 @@ static public java.util.Optional<NodeInfo> ice_read(com.zeroc.Ice.InputStream is
     private static final NodeInfo _nullMarshalValue = new NodeInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 3454075547213801340L;
+    private static final long serialVersionUID = 2353025397664385070L;
 }

slice2java/cpp/src/IceStorm/IceStormElection/ObserverInconsistencyException.java

@@ -59,5 +59,5 @@ protected void _readImpl(com.zeroc.Ice.InputStream istr_)
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 938916114210354718L;
+    private static final long serialVersionUID = 938915915531213381L;
 }

slice2java/cpp/src/IceStorm/IceStormElection/QueryInfo.java

@@ -231,5 +231,5 @@ static public java.util.Optional<QueryInfo> ice_read(com.zeroc.Ice.InputStream i
     private static final QueryInfo _nullMarshalValue = new QueryInfo();
 
     /** @hidden */
-    private static final long serialVersionUID = 4151879864620266410L;
+    private static final long serialVersionUID = 108588510061187594L;
 }

slice2java/cpp/src/IceStorm/IceStormElection/TopicContent.java

@@ -162,5 +162,5 @@ static public java.util.Optional<TopicContent> ice_read(com.zeroc.Ice.InputStrea
     private static final TopicContent _nullMarshalValue = new TopicContent();
 
     /** @hidden */
-    private static final long serialVersionUID = -6534840054319342651L;
+    private static final long serialVersionUID = -8841525952174545191L;
 }

slice2java/cpp/src/icegriddb/IceGrid/AllData.java

@@ -185,5 +185,5 @@ static public java.util.Optional<AllData> ice_read(com.zeroc.Ice.InputStream ist
     private static final AllData _nullMarshalValue = new AllData();
 
     /** @hidden */
-    private static final long serialVersionUID = -2318219210785017412L;
+    private static final long serialVersionUID = 1748339054101725992L;
 }

slice2java/cpp/test/DataStorm/api/Test/ClassKey.java

@@ -45,7 +45,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 1632402483383028763L;
+    private static final long serialVersionUID = 1632390602922858776L;
 
     /** @hidden */
     @Override

slice2java/cpp/test/DataStorm/api/Test/StructKey.java

@@ -138,5 +138,5 @@ static public java.util.Optional<StructKey> ice_read(com.zeroc.Ice.InputStream i
     private static final StructKey _nullMarshalValue = new StructKey();
 
     /** @hidden */
-    private static final long serialVersionUID = -8144777649000760117L;
+    private static final long serialVersionUID = -8144782382325424440L;
 }

slice2java/cpp/test/DataStorm/events/Test/Base.java

@@ -46,7 +46,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = -2623895007626172672L;
+    private static final long serialVersionUID = -2623901861516002078L;
 
     /** @hidden */
     @Override

slice2java/cpp/test/DataStorm/events/Test/Extended.java

@@ -47,7 +47,7 @@ public String ice_id()
     }
 
     /** @hidden */
-    private static final long serialVersionUID = 2516995037543873905L;
+    private static final long serialVersionUID = 2516993814432243625L;
 
     /** @hidden */
     @Override

slice2java/cpp/test/DataStorm/events/Test/StructValue.java

@@ -167,5 +167,5 @@ static public java.util.Optional<StructValue> ice_read(com.zeroc.Ice.InputStream
     private static final StructValue _nullMarshalValue = new StructValue();
 
     /** @hidden */
-    private static final long serialVersionUID = -7938866659900310890L;
+    private static final long serialVersionUID = 8842696599381777742L;
 }

slice2java/cpp/test/DataStorm/partial/Test/Stock.java

@@ -158,5 +158,5 @@ static public java.util.Optional<Stock> ice_read(com.zeroc.Ice.InputStream istr,
     private static final Stock _nullMarshalValue = new Stock();
 
     /** @hidden */
-    private static final long serialVersionUID = 6456142992605850957L;
+    private static final long serialVersionUID = 824765356611485516L;
 }