Commit d9a2b3cf authored by Andre Freyssinet's avatar Andre Freyssinet

Do not updates destinations's properties on creation if null.

parent 0943b9d5
......@@ -446,7 +446,7 @@ public abstract class Destination extends AdministeredObject implements javax.jm
dest.adminName = name;
// If the destination already exists the properties shall be updated.
dest.setProperties(props);
if (dest != null) dest.setProperties(props);
// Be careful, MBean registration is now done explicitly
}
......
......@@ -774,7 +774,8 @@ public class AdminWrapper implements AdminItf {
Queue queue = Queue.createQueue(reply.getId(), name);
// If the destination already exists the properties shall be updated.
processAdmin(queue.getName(), AdminCommandConstant.CMD_SET_PROPERTIES, prop);
if (prop != null)
processAdmin(queue.getName(), AdminCommandConstant.CMD_SET_PROPERTIES, prop);
if (AdminModule.wrapper != this)
queue.setWrapper(this);
......@@ -838,7 +839,8 @@ public class AdminWrapper implements AdminItf {
Topic topic = Topic.createTopic(reply.getId(), name);
// If the destination already exists the properties shall be updated.
processAdmin(topic.getName(), AdminCommandConstant.CMD_SET_PROPERTIES, prop);
if (prop != null)
processAdmin(topic.getName(), AdminCommandConstant.CMD_SET_PROPERTIES, prop);
if (AdminModule.wrapper != this)
topic.setWrapper(this);
......
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