Commit d96158a0 authored by Andre Freyssinet's avatar Andre Freyssinet

Fix initialisation of interceptors in case of explicit setProperties

parent dd5e10ab
......@@ -426,21 +426,11 @@ public abstract class Destination extends Agent implements DestinationMBean {
interceptorsProp = null;
interceptors = null;
if (firstTime && prop != null && prop.containsKey(AdminCommandConstant.INTERCEPTORS)) {
if (prop != null && prop.containsKey(AdminCommandConstant.INTERCEPTORS)) {
if (logger.isLoggable(BasicLevel.DEBUG))
logger.log(BasicLevel.DEBUG, this + ": setProperties interceptors = " + prop.get(AdminCommandConstant.INTERCEPTORS));
//TODO: clean prop
addInterceptor(getDestinationId(), getName(), prop);
}
// Interceptors are set the first time in agent initialization
if (!firstTime) {
if (interceptorsProp != null) {
interceptors = new ArrayList<MessageInterceptor>();
InterceptorsHelper.addInterceptors(getDestinationId(), getName(), AdminCommandConstant.INTERCEPTORS, interceptorsProp, interceptors);
} else {
interceptors = null;
}
}
}
protected boolean isLocal(AgentId id) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment