[tomcat] 01/02: Fix order to support reproducible builds

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 7bc3fff66f916643c90d2947190fdc997f53176e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 18 19:49:30 2022 +0000

    Fix order to support reproducible builds
---
 .../tomcat/util/xreflection/ObjectReflectionPropertyInspector.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
index cf67e47..1d02421 100644
--- 
a/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
+++ 
b/java/org/apache/tomcat/util/xreflection/ObjectReflectionPropertyInspector.java
@@ -24,8 +24,7 @@ import java.lang.reflect.Modifier;
 import java.net.InetAddress;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -112,7 +111,7 @@ public final class ObjectReflectionPropertyInspector {
     }
 
     //types of properties that IntrospectionUtils.setProperty supports
-    private static final Set<Class<?>> ALLOWED_TYPES = 
Collections.unmodifiableSet(new HashSet<>(
+    private static final Set<Class<?>> ALLOWED_TYPES = 
Collections.unmodifiableSet(new LinkedHashSet<>(
         Arrays.asList(
             Boolean.TYPE,
             Integer.TYPE,
@@ -121,7 +120,7 @@ public final class ObjectReflectionPropertyInspector {
             InetAddress.class
         )
     ));
-    private static Map<Class<?>, SetPropertyClass> classes = new HashMap<>();
+    private static Map<Class<?>, SetPropertyClass> classes = new 
LinkedHashMap<>();
 
     public static void generateCode(Set<SetPropertyClass> baseClasses, String 
packageName, File location, String className) throws Exception {
         String packageDirectory = packageName.replace('.','/');

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org