cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r761764 - in /cxf/branches/2.0.x-fixes: ./ integration/jca/src/main/java/org/apache/cxf/jca/inbound/
Date Fri, 03 Apr 2009 19:08:06 GMT
Author: dkulp
Date: Fri Apr  3 19:08:06 2009
New Revision: 761764

URL: http://svn.apache.org/viewvc?rev=761764&view=rev
Log:
Merged revisions 761762 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r761762 | dkulp | 2009-04-03 15:05:11 -0400 (Fri, 03 Apr 2009) | 9 lines
  
  Merged revisions 761759 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r761759 | dkulp | 2009-04-03 14:57:29 -0400 (Fri, 03 Apr 2009) | 2 lines
    
    [CXF-2145] JCA proxy concurrency issue patch from Seumas Soltysik and William Tam applied.
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
    cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
    cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
    cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Apr  3 19:08:06 2009
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983
 -750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752916-752917,752993,757964,757966,757971,757973,760076,760469
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752992,754585,755365,757859,757899,760073,760468
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,710184,711736,712199,712225,712275,712600,712896,713083,713410,713413,713594,713599,713808,713901,714169-714171,718622,718929,719211,719221-719223,7192
 96,719300-719301,719303,719308,719332,719356,719363,719369-719383,719650,719695,720124,723545,724403-724404,724421,724448,724451,724486-724487,724714,725367,725371,725763,725774,726045,726048,726106,726123,726745-726746,726749,726754,726756-726758,726995,727794,727797-727798,727800,731676,731684,731686-731688,731690,733587,733873,733876,733884,733891,733893,733915,735132,735136,735789,736451,736453,736456,736761,736765,736771,736827,736853,737126,737706,737714,737716,737726,737729-737730,737732,737734,737737,737861,738167,738181,738202,738206,738208,738243,738245,738588-738594,739379,739916,739920-739921,739930,740043,740190,740195,740326,740328,740959,741153-741156,741159,741163,741190,743496,743498-743499,743501-743502,743504,743512,743516,743968,744173,744181,745593,745596,745598,745600,745604-745605,745607,745639,745954,746013,746021-746022,747459,747461-747464,747466,747471,747477,747817,748248,748324,748605,748607-748608,749372,750958,750971,750973,750977,750980,750983
 -750984,750986,750988,751006,751235,751238,751943,751979,752118,752142,752162,752244,752248,752563,752615,752852-752854,752856,752916-752917,752993,757964,757966,757971,757973,760076,760469,761762
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,710150,712194,712198,712272,712312,712670,712893,713082,713584,713597,713804,713899,714167-714168,718281,718565,718620,718640,718665,719017,719210,719215-719218,719222,719273,719327-719354,719362,719368,719382,719649,719680,720119-720217,723338,723717-723791,724334-724371,724433-724438,724449,724481,724485,724668,724782,724795,725754,725773,725799,725839,726342,726524,726631,726637,726639,726692,726724,726992,727445,727692,727754,727792,730139,731598,731604,731615,73163
 1,731635,732320,732363,732411,732710,732773,732827,732829,733582,734666,734836,735734,736332,736343,736352,736408,736423,736491,736738,736766,736825,736852,737032,737069,737124,737237,737299,737356,737494,737498,737855,738166,738178,738201,738242,738244,739367,739799-739800,739876-739877,739922,739937,740154,740186,740197,740255,740810,740844,740886,740902,740923,741124,741152,741188,741521,741529,741879,743087,743439,743441,743459,743469,743965,743967,744175,744195,744756,745214,745243,745560,745578,745586,745638,745950,746012,746019-746020,746306,746357,746373-746374,747217,747386,747406,747454,747766,748223,748305,748313,748603-748604,748768,749511,749584,749767,749771,749890,750059-750060,750591,750689,750935,751067-751110,751233,751740,751787,751828,751840,752122,752132,752136,752558,752613,752680,752728,752753,752849,752880-752881,752992,754585,755365,757859,757899,760073,760468,761759
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java?rev=761764&r1=761763&r2=761764&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
(original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/DispatchMDBInvoker.java
Fri Apr  3 19:08:06 2009
@@ -22,6 +22,7 @@
 import java.util.logging.Logger;
 
 import javax.resource.spi.endpoint.MessageEndpoint;
+import javax.resource.spi.endpoint.MessageEndpointFactory;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.message.Exchange;
@@ -45,23 +46,36 @@
     /**
      * @param messageEndpoint
      */
-    public DispatchMDBInvoker(MessageEndpoint messageEndpoint, String targetJndiName) {
-        super(messageEndpoint);
+    public DispatchMDBInvoker(MessageEndpointFactory factory, String targetJndiName) {
+        super(factory);
         this.targetJndiName = targetJndiName;
     }
     
     @Override
     public Object getServiceObject(Exchange context) {
         Object target = null;
+        MessageEndpoint ep = getMessageEndpoint();
+
+        if (ep == null) {
+            LOG.log(Level.SEVERE, "Failed to obtain MessageEndpoint");
+            return null;
+        }
+        
         try {
-            target = ((DispatchMDBMessageListener)getMessageEndpoint())
+            target = ((DispatchMDBMessageListener)ep)
                 .lookupTargetObject(targetJndiName);
         } catch (Exception e) {
             LOG.log(Level.SEVERE, "Failed to obtain service object " + targetJndiName, e);
             return null;
+        } finally {
+            releaseEndpoint(ep);
         }
         
         return target;
     }
 
+    public void releaseServiceObject(final Exchange context, Object obj) {
+
+    }
+
 }

Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java?rev=761764&r1=761763&r2=761764&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
(original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/InboundEndpoint.java
Fri Apr  3 19:08:06 2009
@@ -83,10 +83,7 @@
      * @throws Exception
      */
     public void shutdown() throws Exception {
-        if (invoker != null) {
-            invoker.getMessageEndpoint().release();
-            invoker = null;
-        }
+        invoker = null;
         
         if (server != null) {
             server.stop();

Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java?rev=761764&r1=761763&r2=761764&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
(original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBActivationWork.java
Fri Apr  3 19:08:06 2009
@@ -25,7 +25,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.resource.spi.UnavailableException;
 import javax.resource.spi.endpoint.MessageEndpoint;
 import javax.resource.spi.endpoint.MessageEndpointFactory;
 import javax.resource.spi.work.Work;
@@ -52,12 +51,9 @@
 public class MDBActivationWork implements Work {
     
     private static final Logger LOG = LogUtils.getL7dLogger(MDBActivationWork.class);
-    private static final int MAX_ATTEMPTS = 5;
-    private static final long RETRY_SLEEP = 5000;
 
     private MDBActivationSpec spec;
     private MessageEndpointFactory endpointFactory;
-    private boolean released;
 
     private Map<String, InboundEndpoint> endpoints;
 
@@ -70,28 +66,31 @@
     }
 
     public void release() {
-        released = true;
+
     }
 
     /**
      * Performs the work
      */
     public void run() {
-        // get message driven bean proxy
-        MessageEndpoint endpoint = getMesssageEndpoint();
-        if (endpoint == null) {
-            // error has been logged.
-            return;
+        MDBInvoker invoker = createInvoker();
+        MessageEndpoint mep = invoker.getMessageEndpoint();
+        if (mep == null) {
+            return;            
         }
-    
-        // get class loader
-        ClassLoader classLoader = endpoint.getClass().getClassLoader();
-        ClassLoader savedClassLoader = Thread.currentThread().getContextClassLoader();
+        
+        ClassLoader savedClassLoader = null;
+
         try {
+            savedClassLoader = Thread.currentThread().getContextClassLoader();
+            ClassLoader classLoader = mep.getClass().getClassLoader();
             Thread.currentThread().setContextClassLoader(classLoader);
-            activate(endpoint, classLoader);
+            activate(invoker, classLoader);
         } finally {
-            Thread.currentThread().setContextClassLoader(savedClassLoader);
+            invoker.releaseEndpoint(mep);
+            if (savedClassLoader != null) {
+                Thread.currentThread().setContextClassLoader(savedClassLoader);
+            }
         }
     }
     
@@ -99,7 +98,7 @@
      * @param endpoint
      * @param classLoader 
      */
-    private void activate(MessageEndpoint endpoint, ClassLoader classLoader) {
+    private void activate(MDBInvoker invoker, ClassLoader classLoader) {
         Class<?> serviceClass = null;
         if (spec.getServiceInterfaceClass() != null) {
             try {
@@ -128,7 +127,6 @@
             bus = BusFactory.getDefaultBus();
         }
 
-        MDBInvoker invoker = createInvoker(endpoint);
         Server server = createServer(bus, serviceClass, invoker);
         
         if (server == null) {
@@ -231,49 +229,15 @@
      * @param endpoint
      * @return
      */
-    private MDBInvoker createInvoker(MessageEndpoint endpoint) {
+    private MDBInvoker createInvoker() {
         MDBInvoker answer = null;
         if (spec instanceof DispatchMDBActivationSpec) {
-            answer = new DispatchMDBInvoker(endpoint, 
+            answer = new DispatchMDBInvoker(endpointFactory, 
                     ((DispatchMDBActivationSpec)spec).getTargetBeanJndiName());
         } else {
-            answer = new MDBInvoker(endpoint);
+            answer = new MDBInvoker(endpointFactory);
         }
         return answer;
     }
 
-    /**
-     * Invokes endpoint factory to create message endpoint (event driven bean).
-     * It will retry if the event driven bean is not yet available.
-     */
-    private MessageEndpoint getMesssageEndpoint() {
-        MessageEndpoint answer = null;
-        for (int i = 0; i < MAX_ATTEMPTS; i++) {
-            
-            if (released) {
-                LOG.warning("CXF service activation has been stopped.");
-                return null;
-            }
-            
-            try {
-                answer = endpointFactory.createEndpoint(null);
-                break;
-            } catch (UnavailableException e) {
-                LOG.fine("Target endpoint activation in progress.  Will retry.");
-                try {
-                    Thread.sleep(RETRY_SLEEP);
-                } catch (InterruptedException e1) {
-                    // ignore
-                }
-            }
-        }
-        
-        if (answer == null) {
-            LOG.severe("Failed to activate  service endpoint " 
-                    + spec.getDisplayName() 
-                    + " due to unable to endpoint listener.");
-        }
-        
-        return answer;
-    }
 }

Modified: cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java?rev=761764&r1=761763&r2=761764&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
(original)
+++ cxf/branches/2.0.x-fixes/integration/jca/src/main/java/org/apache/cxf/jca/inbound/MDBInvoker.java
Fri Apr  3 19:08:06 2009
@@ -18,8 +18,13 @@
  */
 package org.apache.cxf.jca.inbound;
 
+import java.util.logging.Logger;
+
+import javax.resource.spi.UnavailableException;
 import javax.resource.spi.endpoint.MessageEndpoint;
+import javax.resource.spi.endpoint.MessageEndpointFactory;
 
+import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.message.Exchange;
 import org.apache.cxf.service.invoker.AbstractInvoker;
 
@@ -35,26 +40,62 @@
  * (SEI) class.
  */
 public class MDBInvoker extends AbstractInvoker {
-
-    private MessageEndpoint messageEndpoint;
+    private static final Logger LOG = LogUtils.getL7dLogger(MDBInvoker.class);
+    private static final int MAX_ATTEMPTS = 5;
+    private static final long RETRY_SLEEP = 2000;
+    
+    private final MessageEndpointFactory endpointFactory;
 
     /**
      * @param messageEndpoint
      */
-    public MDBInvoker(MessageEndpoint messageEndpoint) {
-        this.messageEndpoint = messageEndpoint;
+    public MDBInvoker(MessageEndpointFactory factory) {
+        endpointFactory = factory;
     }
 
     /**
      * @return the messageEndpoint
      */
     public MessageEndpoint getMessageEndpoint() {
-        return messageEndpoint;
+        return createMessageEndpoint();
+    }
+
+    protected void releaseEndpoint(MessageEndpoint mep) {
+        mep.release();
     }
 
     @Override
     public Object getServiceObject(Exchange context) {
-        return messageEndpoint;
+        return getMessageEndpoint();
+    }
+    
+    public void releaseServiceObject(final Exchange context, Object obj) {
+        if (obj instanceof MessageEndpoint) {
+            MessageEndpoint mep = (MessageEndpoint)obj;
+            releaseEndpoint(mep);
+        }
     }
 
+    /**
+     * Invokes endpoint factory to create message endpoint (event driven bean).
+     * It will retry if the event driven bean is not yet available.
+     */
+    private MessageEndpoint createMessageEndpoint() {
+        MessageEndpoint ep = null;
+        for (int i = 0; i < MAX_ATTEMPTS; i++) {
+            try {
+                ep = endpointFactory.createEndpoint(null);
+                break;
+            } catch (UnavailableException e) {
+                LOG.fine("Target endpoint activation in progress.  Will retry.");
+                try {
+                    Thread.sleep(RETRY_SLEEP);
+                } catch (InterruptedException e1) {
+                    // ignore
+                }
+            }
+        }
+        
+        return ep;
+    }
 }



Mime
View raw message