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

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

Author: jesper.pedersen
Date: 2009-09-25 14:38:26 -0400 (Fri, 25 Sep 2009)
New Revision: 94029

Modified:
   branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java
   branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/JmsSessionFactoryImpl.java
Log:
[JBPAPP-2230] Backport JMS resource adapter from trunk

Modified: branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java	2009-09-25 17:02:56 UTC (rev 94028)
+++ branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/JmsResourceAdapter.java	2009-09-25 18:38:26 UTC (rev 94029)
@@ -23,6 +23,7 @@
 
 import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import javax.resource.ResourceException;
 import javax.resource.spi.ActivationSpec;
@@ -37,8 +38,6 @@
 import org.jboss.resource.adapter.jms.inflow.JmsActivation;
 import org.jboss.resource.adapter.jms.inflow.JmsActivationSpec;
 
-import EDU.oswego.cs.dl.util.concurrent.ConcurrentReaderHashMap;
-
 /**
  * A generic resource adapter for any JMS server.
  * 
@@ -54,7 +53,7 @@
    private BootstrapContext ctx;
 
    /** The activations by activation spec */
-   private ConcurrentReaderHashMap activations = new ConcurrentReaderHashMap();
+   private ConcurrentHashMap activations = new ConcurrentHashMap();
    
    /**
     * Get the work manager

Modified: branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/JmsSessionFactoryImpl.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/JmsSessionFactoryImpl.java	2009-09-25 17:02:56 UTC (rev 94028)
+++ branches/JBPAPP_4_2_0_GA_CP/connector/src/main/org/jboss/resource/adapter/jms/JmsSessionFactoryImpl.java	2009-09-25 18:38:26 UTC (rev 94029)
@@ -193,6 +193,10 @@
    public String getClientID() throws JMSException
    {
       checkClosed();
+
+      if (clientID == null)
+         return mcf.getClientID();
+
       return clientID;
    }
     
@@ -384,20 +388,20 @@
             info.setUserName(userName);
             info.setPassword(password);
             info.setClientID(clientID);
-            //JBPAPP-1464 - set defaults before it's too late
             info.setDefaults(mcf.getProperties());
+
             if (trace)
                log.trace("Allocating session for " + this + " with request info=" + info);
             JmsSession session = (JmsSession) cm.allocateConnection(mcf, info);
             try
             {
-	            if (trace)
-	               log.trace("Allocated  " + this + " session=" + session);
-	            session.setJmsSessionFactory(this);
-	            if (started)
-	               session.start();
-	            sessions.add(session);
-	            return session;
+               if (trace)
+                  log.trace("Allocated  " + this + " session=" + session);
+               session.setJmsSessionFactory(this);
+               if (started)
+                  session.start();
+               sessions.add(session);
+               return session;
             }
             catch (Throwable t)
             {
@@ -455,5 +459,4 @@
          throw ex;
       }
    }
-
 }