[jboss-svn-commits] JBL Code SVN: r8729 - in labs/jbossesb/trunk/product/core/listeners/src/org/jboss: internal/soa/esb/listeners soa/esb/listeners/gateway

[jboss-svn-commits at lists.jboss.org]

Author: estebanschifman
Date: 2007-01-05 17:40:08 -0500 (Fri, 05 Jan 2007)
New Revision: 8729

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/listeners/DefaultListenerManager.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerController.java
Log:
Fix reload problem when parameters don't come from a file

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/listeners/DefaultListenerManager.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/listeners/DefaultListenerManager.java	2007-01-05 22:18:07 UTC (rev 8728)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/internal/soa/esb/listeners/DefaultListenerManager.java	2007-01-05 22:40:08 UTC (rev 8729)
@@ -355,22 +355,27 @@
 
 			relaunch = false;
 			
-			if (_parametersName != null && isReloadNeeded())
+			if (isReloadNeeded())
 			{
-				synchronized(_synchReload)
-				{
-					_emitWarning = true ;
-				}
 				try
 				{
-					_status = State.Loading_parameters;
-					_logger
+					if (_parametersName != null)
+					{
+						synchronized(_synchReload)
+						{
+							_emitWarning = true ;
+						}
+						_status = State.Loading_parameters;
+						_logger
 							.debug("Reloading parameters _____________________________________________________");
-					ConfigTree oNew = DefaultListenerManager
+						ConfigTree oNew = DefaultListenerManager
 							.getListenerConfig(_parametersName);
-					checkParms(oNew);
-					_config = oNew;
-					relaunch = true;
+						checkParms(oNew);
+						_config = oNew;
+						relaunch = true;
+					}
+					else
+						checkParms(_config);
 				}
 				catch (Exception e)
 				{

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerController.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerController.java	2007-01-05 22:18:07 UTC (rev 8728)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/gateway/GatewayListenerController.java	2007-01-05 22:40:08 UTC (rev 8729)
@@ -309,16 +309,21 @@
 			}
 
 			relaunch = false;
-			if (_sParametersName != null && isReloadNeeded()) 
+			if (isReloadNeeded()) 
 				try 
 				{
-					_status = State.Loading_parameters;
-					_logger
+					if (_sParametersName != null)
+					{
+						_status = State.Loading_parameters;
+						_logger
 							.info("Reloading parameters _____________________________________________________");
-					ConfigTree oNew = GatewayListenerController.getListenerConfig(_sParametersName);
-					checkParms(oNew);
-					_config = oNew;
-					relaunch = true;
+						ConfigTree oNew = GatewayListenerController.getListenerConfig(_sParametersName);
+						checkParms(oNew);
+						_config = oNew;
+						relaunch = true;
+					}
+					else
+						checkParms(_config);
 				} 
 				catch (Exception e) 
 				{