[jboss-cvs] JBoss Messaging SVN: r2303 - in trunk: tests/src/org/jboss/test/messaging/tools/jmx and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 13 18:07:40 EST 2007
Author: timfox
Date: 2007-02-13 18:07:40 -0500 (Tue, 13 Feb 2007)
New Revision: 2303
Modified:
trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java
Log:
remove unnecessary promptDelivery() and let test.database override the value inferred from the database url
Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2007-02-13 21:06:57 UTC (rev 2302)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java 2007-02-13 23:07:40 UTC (rev 2303)
@@ -153,8 +153,10 @@
// adding the consumer to the queue
this.messageQueue.add(this);
+ //We don't need to prompt delivery - this will come from the client in a changeRate request
+
// prompt delivery
- promptDelivery();
+ //promptDelivery();
log.debug(this + " constructed");
}
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java 2007-02-13 21:06:57 UTC (rev 2302)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java 2007-02-13 23:07:40 UTC (rev 2303)
@@ -407,6 +407,11 @@
{
throw new IllegalArgumentException("Invalid connection URL: " + s);
}
+
+ //FIXME - why the heck try and infer the database name from the connection URL
+ //this is not correct
+ //Different databases could be using the same url (this can be the case with sybase and mssql)
+ //why not just get the database name from the system property??
this.type = st.nextToken();
this.connectionURL = s;
}
@@ -418,7 +423,22 @@
String getDatabaseType()
{
- return type;
+ //Temporary kludge so I can run the test suite
+ //FIXME - why the heck try and infer the database name from the connection URL
+ //this is not correct
+ //Different databases could be using the same url (this can be the case with sybase and mssql)
+ //why not just get the database name from the system property??
+
+ String theType = System.getProperty("test.database");
+
+ if (theType != null)
+ {
+ return theType;
+ }
+ else
+ {
+ return type;
+ }
}
void setDatabaseDriverClass(String s)
More information about the jboss-cvs-commits
mailing list