You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by sm...@apache.org on 2021/07/28 07:03:22 UTC
[knox] branch master updated: KNOX-2638 - Shiro propererties are
missing after topology deployment (#472)
This is an automated email from the ASF dual-hosted git repository.
smolnar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new ba54cc3 KNOX-2638 - Shiro propererties are missing after topology deployment (#472)
ba54cc3 is described below
commit ba54cc3b7baeb0a4db500234953391da0be7b176
Author: Attila Magyar <m....@gmail.com>
AuthorDate: Wed Jul 28 09:03:14 2021 +0200
KNOX-2638 - Shiro propererties are missing after topology deployment (#472)
---
.../src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java | 2 +-
.../knox/gateway/services/topology/impl/DefaultTopologyService.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
index d82a69f..5e60d65 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroConfig.java
@@ -28,7 +28,7 @@ public class ShiroConfig {
private Map<String, Map<String, String>> sections = new LinkedHashMap<>();
public ShiroConfig(Provider provider, String clusterName) {
- Map<String, String> params = provider.getParams();
+ Map<String, String> params = new LinkedHashMap<>(provider.getParams()); // make a copy since we modify the map
String name;
String sectionName;
String value;
diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
index b9a24cc..798d23e 100644
--- a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
+++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java
@@ -37,8 +37,8 @@ import org.apache.knox.gateway.i18n.messages.MessagesFactory;
import org.apache.knox.gateway.service.definition.ServiceDefinition;
import org.apache.knox.gateway.service.definition.ServiceDefinitionChangeListener;
import org.apache.knox.gateway.services.GatewayServices;
-import org.apache.knox.gateway.services.ServiceType;
import org.apache.knox.gateway.services.ServiceLifecycleException;
+import org.apache.knox.gateway.services.ServiceType;
import org.apache.knox.gateway.services.config.client.RemoteConfigurationRegistryClient;
import org.apache.knox.gateway.services.security.AliasService;
import org.apache.knox.gateway.services.topology.TopologyService;