[hornetq-commits] JBoss hornetq SVN: r9620 - in branches/Branch_2_1/src/main/org/hornetq/core: deployers/impl and 1 other directory.
Author: clebert.suconic(a)jboss.com
Date: 2010-08-31 18:06:01 -0400 (Tue, 31 Aug 2010)
New Revision: 9620
Modified:
branches/Branch_2_1/src/main/org/hornetq/core/config/impl/FileConfiguration.java
branches/Branch_2_1/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
Log:
https://jira.jboss.org/browse/HORNETQ-478 - eliminating extra warning
Modified:
branches/Branch_2_1/src/main/org/hornetq/core/config/impl/FileConfiguration.java
===================================================================
---
branches/Branch_2_1/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-08-31
16:29:21 UTC (rev 9619)
+++
branches/Branch_2_1/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-08-31
22:06:01 UTC (rev 9620)
@@ -77,6 +77,11 @@
Element e = org.hornetq.utils.XMLUtil.stringToElement(xml);
FileConfigurationParser parser = new FileConfigurationParser();
+
+ // https://jira.jboss.org/browse/HORNETQ-478 - We only want to validate AIO when
+ // starting the server
+ // and we don't want to do it when deploying hornetq-queues.xml which uses
the same parser and XML format
+ parser.setValidateAIO(true);
parser.parseMainConfig(e, this);
Modified:
branches/Branch_2_1/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java
===================================================================
---
branches/Branch_2_1/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-08-31
16:29:21 UTC (rev 9619)
+++
branches/Branch_2_1/src/main/org/hornetq/core/deployers/impl/FileConfigurationParser.java 2010-08-31
22:06:01 UTC (rev 9620)
@@ -123,13 +123,31 @@
private static final String SEND_TO_DLA_ON_NO_ROUTE =
"send-to-dla-on-no-route";
// Attributes ----------------------------------------------------
+
+ private boolean validateAIO = false;
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
// Public --------------------------------------------------------
+
+ /**
+ * @return the validateAIO
+ */
+ public boolean isValidateAIO()
+ {
+ return validateAIO;
+ }
+ /**
+ * @param validateAIO the validateAIO to set
+ */
+ public void setValidateAIO(boolean validateAIO)
+ {
+ this.validateAIO = validateAIO;
+ }
+
public Configuration parseMainConfig(final InputStream input) throws Exception
{
@@ -431,7 +449,10 @@
}
else
{
- log.warn("AIO wasn't located on this platform, it will fall back to
using pure Java NIO. If your platform is Linux, install LibAIO to enable the AIO
journal");
+ if (validateAIO)
+ {
+ log.warn("AIO wasn't located on this platform, it will fall back
to using pure Java NIO. If your platform is Linux, install LibAIO to enable the AIO
journal");
+ }
config.setJournalType(JournalType.NIO);
}