[jboss-cvs] JBossAS SVN: r85243 - branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms.

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

Author: jesper.pedersen
Date: 2009-03-04 12:46:14 -0500 (Wed, 04 Mar 2009)
New Revision: 85243

Modified:
   branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsSessionFactoryImpl.java
Log:
[JBAS-6277] JmsSessionFactoryImpl should look at MCF for client id when not set by the user

Modified: branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsSessionFactoryImpl.java
===================================================================
--- branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsSessionFactoryImpl.java	2009-03-04 17:45:55 UTC (rev 85242)
+++ branches/Branch_4_2/connector/src/main/org/jboss/resource/adapter/jms/JmsSessionFactoryImpl.java	2009-03-04 17:46:14 UTC (rev 85243)
@@ -193,6 +193,10 @@
    public String getClientID() throws JMSException
    {
       checkClosed();
+
+      if (clientID == null)
+         return mcf.getClientID();
+
       return clientID;
    }