[jboss-cvs] JBoss Messaging SVN: r6008 - trunk/src/main/org/jboss/messaging/ra.

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

Author: jesper.pedersen
Date: 2009-03-05 09:45:50 -0500 (Thu, 05 Mar 2009)
New Revision: 6008

Modified:
   trunk/src/main/org/jboss/messaging/ra/JBMSessionFactoryImpl.java
Log:
[JBMESSAGING-1367] Port some fixes from generic adapter

Modified: trunk/src/main/org/jboss/messaging/ra/JBMSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/ra/JBMSessionFactoryImpl.java	2009-03-05 11:59:21 UTC (rev 6007)
+++ trunk/src/main/org/jboss/messaging/ra/JBMSessionFactoryImpl.java	2009-03-05 14:45:50 UTC (rev 6008)
@@ -181,6 +181,10 @@
          log.trace("getClientID()");
 
       checkClosed();
+
+      if (clientID == null)
+         return ((JBMResourceAdapter)mcf.getResourceAdapter()).getProperties().getClientID();
+
       return clientID;
    }
     
@@ -602,6 +606,7 @@
             info.setUserName(userName);
             info.setPassword(password);
             info.setClientID(clientID);
+            info.setDefaults(((JBMResourceAdapter)mcf.getResourceAdapter()).getProperties());
 
             if (trace)
                log.trace("Allocating session for " + this + " with request info=" + info);