[hornetq-commits] JBoss hornetq SVN: r9051 - in trunk/src/main/org/hornetq/core: server/cluster/impl and 1 other directory.

[do-not-reply at jboss.org]

Author: jmesnil
Date: 2010-04-02 08:48:54 -0400 (Fri, 02 Apr 2010)
New Revision: 9051

Modified:
   trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
   trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
Log:
https://jira.jboss.org/jira/browse/HORNETQ-338: forwarding-address must neither be null nor empty

* allow the forwarding address to be null (in that case, the original message address will be used instead)

Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java	2010-04-02 10:02:01 UTC (rev 9050)
+++ trunk/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java	2010-04-02 12:48:54 UTC (rev 9051)
@@ -1023,7 +1023,7 @@
       String forwardingAddress = XMLConfigurationUtil.getString(brNode,
                                                                 "forwarding-address",
                                                                 null,
-                                                                Validators.NOT_NULL_OR_EMPTY);
+                                                                Validators.NO_CHECK);
 
       String transformerClassName = XMLConfigurationUtil.getString(brNode,
                                                                    "transformer-class-name",

Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2010-04-02 10:02:01 UTC (rev 9050)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2010-04-02 12:48:54 UTC (rev 9051)
@@ -363,9 +363,7 @@
 
       if (config.getForwardingAddress() == null)
       {
-         ClusterManagerImpl.log.warn("Must specify an forwarding address each bridge. This one will not be deployed.");
-
-         return;
+         ClusterManagerImpl.log.debug("Forward address is not specified. Will use original message address instead");
       }
 
       if (bridges.containsKey(config.getName()))