[jboss-cvs] JBoss Messaging SVN: r6105 - in trunk: src/main/org/jboss/messaging/core/client/impl and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2009-03-18 10:39:07 -0400 (Wed, 18 Mar 2009)
New Revision: 6105

Modified:
   trunk/build-messaging.xml
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
Log:
Removing the System.property.
(This property was a temporary measure for an investigation about timeouts on hudson. It's not necessary any more)

Modified: trunk/build-messaging.xml
===================================================================
--- trunk/build-messaging.xml	2009-03-17 23:28:28 UTC (rev 6104)
+++ trunk/build-messaging.xml	2009-03-18 14:39:07 UTC (rev 6105)
@@ -1153,7 +1153,6 @@
              timeout="${junit.timeout}">
          <sysproperty key="user.home" value="${user.home}"/>
          <sysproperty key="java.io.tmpdir" value="${java.io.tmpdir}"/>
-      	 <sysproperty key="org.jboss.messaging.default-call-timeout" value="60000"/>
          <jvmarg value="-Djava.library.path=native/bin"/>
          <jvmarg value="-Dmodule.output=./"/>
          <jvmarg value="-Djava.util.logging.config.file=src/config/logging.properties"/>

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java	2009-03-17 23:28:28 UTC (rev 6104)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java	2009-03-18 14:39:07 UTC (rev 6105)
@@ -75,26 +75,8 @@
 
    public static final boolean DEFAULT_AUTO_GROUP = false;
 
-    public static final long DEFAULT_CALL_TIMEOUT;
-   
-   static
-   {
-      long value;
-      try
-      {
-         // This system-variable is used on tests.
-         value = Long.parseLong(System.getProperty("org.jboss.messaging.default-call-timeout", "30000"));
-      }
-      catch (Exception e)
-      {
-         
-         // Security Managemen is probably in use on the VM
-         value = 30000;
-      }
+   public static final long DEFAULT_CALL_TIMEOUT = 30000;
 
-      DEFAULT_CALL_TIMEOUT = value;
-   }
-
    public static final int DEFAULT_MAX_CONNECTIONS = 8;
 
    public static final int DEFAULT_ACK_BATCH_SIZE = 1024 * 1024;