safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-09 06:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1364: Ensure extension resources are included in defined order.

Browse Source
This commit is contained in:
Michael Jumper
2021-04-07 16:11:25 -07:00
parent 45c2cbf6b8
commit 2aa6a5b628
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
guacamole/src/main/java/org/apache/guacamole/extension/Extension.java
View File

@@ -26,7 +26,7 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipException; import java.util.zip.ZipException;
@@ -149,7 +149,7 @@ public class Extension {
return Collections.<String, Resource>emptyMap(); return Collections.<String, Resource>emptyMap();
// Add classpath resource for each path provided // Add classpath resource for each path provided
Map<String, Resource> resources = new HashMap<String, Resource>(paths.size()); Map<String, Resource> resources = new LinkedHashMap<>(paths.size());
for (String path : paths) for (String path : paths)
resources.put(path, new ClassPathResource(classLoader, mimetype, path)); resources.put(path, new ClassPathResource(classLoader, mimetype, path));
@@ -178,7 +178,7 @@ public class Extension {
return Collections.<String, Resource>emptyMap(); return Collections.<String, Resource>emptyMap();
// Add classpath resource for each path/mimetype pair provided // Add classpath resource for each path/mimetype pair provided
Map<String, Resource> resources = new HashMap<String, Resource>(resourceTypes.size()); Map<String, Resource> resources = new LinkedHashMap<>(resourceTypes.size());
for (Map.Entry<String, String> resource : resourceTypes.entrySet()) { for (Map.Entry<String, String> resource : resourceTypes.entrySet()) {
// Get path and mimetype from entry // Get path and mimetype from entry