[jboss-cvs] JBoss Messaging SVN: r7629 - trunk/src/main/org/jboss/messaging/jms/server/impl.

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

Author: jmesnil
Date: 2009-07-28 08:14:50 -0400 (Tue, 28 Jul 2009)
New Revision: 7629

Modified:
   trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
Log:
JBMESSAGING-1694: -1 is a valid value for connection-ttl & client-failure-check -period

* updated the validator used to validate the parameters

Modified: trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java	2009-07-28 03:21:22 UTC (rev 7628)
+++ trunk/src/main/org/jboss/messaging/jms/server/impl/JMSServerDeployer.java	2009-07-28 12:14:50 UTC (rev 7629)
@@ -123,8 +123,8 @@
       {
          Element e = (Element)node;
 
-         long clientFailureCheckPeriod = getLong(e, "client-failure-check-period", ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, GT_ZERO);
-         long connectionTTL = getLong(e, "connection-ttl", ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, GE_ZERO);
+         long clientFailureCheckPeriod = getLong(e, "client-failure-check-period", ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, MINUS_ONE_OR_GT_ZERO);
+         long connectionTTL = getLong(e, "connection-ttl", ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, MINUS_ONE_OR_GE_ZERO);
          long callTimeout = getLong(e, "call-timeout", ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, GE_ZERO);
          String clientID = getString(e, "client-id", null, Validators.NO_CHECK);
          int dupsOKBatchSize = getInteger(e, "dups-ok-batch-size", ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, GT_ZERO);