for #411 overwriting configmanager is a bad idea

TremoloSecurity · Apr 20, 2020 · 3d52934 · 3d52934
1 parent 38d5908
commit 3d52934
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/...-unison-classes/src/main/java/com/tremolosecurity/openunison/OpenUnisonServletFilter.java b/...-unison-classes/src/main/java/com/tremolosecurity/openunison/OpenUnisonServletFilter.java
@@ -47,7 +47,7 @@ public class OpenUnisonServletFilter extends UnisonServletFilter {
 
 
 
-	public static final String version = "1.0.18-2020042002";
+	public static final String version = "1.0.18-2020042003";
 
 
 

diff --git a/...nison-scalejs-operators/src/main/java/com/tremolosecurity/scalejs/ws/ScaleJSOperator.java b/...nison-scalejs-operators/src/main/java/com/tremolosecurity/scalejs/ws/ScaleJSOperator.java
@@ -544,7 +544,7 @@ public void initFilter(HttpFilterConfig config) throws Exception {
 			if (filter.getClazz().equalsIgnoreCase("com.tremolosecurity.scalejs.ws.ScaleMain")) {
 				for (ParamType pt : filter.getParam()) {
 					if (pt.getName().equalsIgnoreCase("uiHelperClassName")) {
-						this.dec = (UiDecisions) Class.forName(pt.getName()).newInstance();
+						this.dec = (UiDecisions) Class.forName(pt.getValue()).newInstance();
 					} else if (pt.getName().equalsIgnoreCase("uihelper.params")) {
 						String v = pt.getValue();
 						String name = v.substring(0,v.indexOf('='));

diff --git a/...rver-core/src/main/java/com/tremolosecurity/provisioning/core/ProvisioningEngineImpl.java b/...rver-core/src/main/java/com/tremolosecurity/provisioning/core/ProvisioningEngineImpl.java
@@ -450,7 +450,10 @@ public ProvisioningEngineImpl(ConfigManager cfgMgr) throws ProvisioningException
 
 		this.cfgMgr = cfgMgr;
 
-		GlobalEntries.getGlobalEntries().set(ProxyConstants.CONFIG_MANAGER, cfgMgr);
+
+		if (GlobalEntries.getGlobalEntries().getConfigManager() == null) { 
+			GlobalEntries.getGlobalEntries().set(ProxyConstants.CONFIG_MANAGER, cfgMgr);
+		}
 
 		this.initLocalBroker();
 
@@ -576,6 +579,9 @@ public ProvisioningEngineImpl(ConfigManager cfgMgr) throws ProvisioningException
 	 */
 	@Override
 	public void initWorkFlows() throws ProvisioningException {
+
+
+
 		Iterator<String> wfNames = this.workflows.keySet().iterator();
 		while (wfNames.hasNext()) {
 			String name = wfNames.next();
@@ -1420,10 +1426,11 @@ private void initLocalBroker() throws ProvisioningException {
 			}
 
 			try {
+
 				JMSSessionHolder sessionHolder = JMSConnectionFactory.getConnectionFactory().getSession(taskQueueName);
 				this.mpPools.add(sessionHolder);
-			} catch (Exception e) {
-				logger.warn("Could not create internal queue",e);
+			} catch (Throwable t) {
+				logger.warn("Could not create internal queue " + taskQueueName);
 			}
 
 		} else {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -47,7 +47,7 @@ public class OpenUnisonServletFilter extends UnisonServletFilter {



		public static final String version = "1.0.18-2020042002";
		public static final String version = "1.0.18-2020042003";



Expand Down