qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1721149 - in /qpid/java/trunk/perftests: etc/perftests-jndi.properties src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
Date Mon, 21 Dec 2015 13:22:53 GMT
Author: kwall
Date: Mon Dec 21 13:22:53 2015
New Revision: 1721149

URL: http://svn.apache.org/viewvc?rev=1721149&view=rev
Log:
NO-JIRA: [Java Perf Tests] Have perftests record protocol version when testing with an AMQP
1.0 client

Modified:
    qpid/java/trunk/perftests/etc/perftests-jndi.properties
    qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java

Modified: qpid/java/trunk/perftests/etc/perftests-jndi.properties
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/etc/perftests-jndi.properties?rev=1721149&r1=1721148&r2=1721149&view=diff
==============================================================================
--- qpid/java/trunk/perftests/etc/perftests-jndi.properties (original)
+++ qpid/java/trunk/perftests/etc/perftests-jndi.properties Mon Dec 21 13:22:53 2015
@@ -22,7 +22,7 @@ perftestResultsDirectory=perftestResults
 connectionfactory.connectionfactory = amqp://guest:guest@clientid/?brokerlist='${brokerHostPortPlain}'
 connectionfactory.sslconnectionfactory = amqp://guest:guest@clientid/?ssl='true'&brokerlist='${brokerHostPortSsl}'
 
-destination.controllerqueue = direct://amq.direct//controllerqueue?autodelete='true'
+queue.controllerqueue = controllerqueue
 
 jdbcDriverClass=org.apache.derby.jdbc.EmbeddedDriver
 # writes to a results database in ./perftestResultsDb by default.

Modified: qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java?rev=1721149&r1=1721148&r2=1721149&view=diff
==============================================================================
--- qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
(original)
+++ qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/ClientJmsDelegate.java
Mon Dec 21 13:22:53 2015
@@ -818,6 +818,19 @@ public class ClientJmsDelegate
             }
             catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException
e)
             {
+                try
+                {
+                    ConnectionMetaData  metaData = connection.getMetaData();
+                    if (metaData != null && ("QpidJMS".equals(metaData.getJMSProviderName())
||
+                                             "AMQP.ORG".equals(metaData.getJMSProviderName())))
+                    {
+                        return "1.0";
+                    }
+                }
+                catch (JMSException e1)
+                {
+                    return null;
+                }
                 return null;
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message