Author: dkulp
Date: Fri Feb 27 17:23:32 2009
New Revision: 748608
URL: http://svn.apache.org/viewvc?rev=748608&view=rev
Log:
Merged revisions 748604 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r748604 | dkulp | 2009-02-27 12:17:33 -0500 (Fri, 27 Feb 2009) | 3 lines
[CXF-2034] Add lifecycle listener to make sure the listeners are shutdown
If the user specifies a CorrelationID and the destination cannot handle that,
bring up a new temporary queue to handle it to avoid a "hang".
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 27 17:23:32 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
8223,748305,748313,748603
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560,745578,745586,745592,745638,745950,746012,746019-746020,746256,746266,746306,746357,746373-746374,747217,747386,747406,747454,747649,747766,747986,748159,748192,74
8223,748305,748313,748603-748604
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=748608&r1=748607&r2=748608&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
Fri Feb 27 17:23:32 2009
@@ -24,6 +24,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.lang.ref.WeakReference;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
@@ -35,6 +36,9 @@
import javax.jms.MessageListener;
import javax.jms.Session;
+import org.apache.cxf.Bus;
+import org.apache.cxf.buslifecycle.BusLifeCycleListener;
+import org.apache.cxf.buslifecycle.BusLifeCycleManager;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.message.Exchange;
import org.apache.cxf.message.Message;
@@ -54,6 +58,7 @@
* Message. This is then provided in the Exchange and also sent to the
incomingObserver
*/
public class JMSConduit extends AbstractConduit implements JMSExchangeSender,
MessageListener {
+
static final Logger LOG = LogUtils.getL7dLogger(JMSConduit.class);
private static final String CORRELATED = JMSConduit.class.getName() +
".correlated";
@@ -62,8 +67,10 @@
private JMSConfiguration jmsConfig;
private Map<String, Exchange> correlationMap;
private DefaultMessageListenerContainer jmsListener;
+ private DefaultMessageListenerContainer allListener;
private String conduitId;
private AtomicLong messageCount;
+ private JMSBusLifeCycleListener listener;
public JMSConduit(EndpointInfo endpointInfo, EndpointReferenceType target,
JMSConfiguration jmsConfig) {
super(target);
@@ -108,12 +115,32 @@
.get(JMSConstants.JMS_CLIENT_REQUEST_HEADERS);
JmsTemplate jmsTemplate = JMSFactory.createJmsTemplate(jmsConfig,
headers);
- if (!exchange.isOneWay() && jmsListener == null) {
- jmsListener = JMSFactory.createJmsListener(jmsConfig, this,
jmsConfig.getReplyDestination(),
- conduitId);
+ String userCID = headers != null ? headers.getJMSCorrelationID() :
null;
+ DefaultMessageListenerContainer jmsList = jmsListener;
+ if (!exchange.isOneWay()) {
+ if (userCID == null || !jmsConfig.isUseConduitIdSelector()) {
+ if (jmsListener == null) {
+ jmsListener = JMSFactory.createJmsListener(jmsConfig,
this,
+
jmsConfig.getReplyDestination(),
+ conduitId,
+ false);
+ addBusListener(exchange.get(Bus.class));
+ }
+ jmsList = jmsListener;
+ } else {
+ if (allListener == null) {
+ allListener = JMSFactory.createJmsListener(jmsConfig,
+ this,
+ null,
+ null,
+ true);
+ addBusListener(exchange.get(Bus.class));
+ }
+ jmsList = allListener;
+ }
}
- final javax.jms.Destination replyTo = exchange.isOneWay() ? null :
jmsListener.getDestination();
+ final javax.jms.Destination replyTo = exchange.isOneWay() ? null :
jmsList.getDestination();
final String correlationId = (headers != null &&
headers.isSetJMSCorrelationID())
? headers.getJMSCorrelationID()
@@ -154,8 +181,6 @@
throw new RuntimeException("Timeout receiving message
with correlationId "
+ correlationId);
}
-
-
}
}
} else {
@@ -163,6 +188,46 @@
}
}
+ static class JMSBusLifeCycleListener implements BusLifeCycleListener {
+ final WeakReference<JMSConduit> ref;
+ BusLifeCycleManager blcm;
+ JMSBusLifeCycleListener(JMSConduit c, BusLifeCycleManager b) {
+ ref = new WeakReference<JMSConduit>(c);
+ blcm = b;
+ blcm.registerLifeCycleListener(this);
+ }
+
+ public void initComplete() {
+ }
+
+ public void postShutdown() {
+ }
+
+ public void preShutdown() {
+ unreg();
+ blcm = null;
+ JMSConduit c = ref.get();
+ if (c != null) {
+ c.listener = null;
+ c.close();
+ }
+ }
+ public void unreg() {
+ if (blcm != null) {
+ blcm.unregisterLifeCycleListener(this);
+ }
+ }
+ }
+ private synchronized void addBusListener(Bus bus) {
+ if (listener == null && bus != null) {
+ BusLifeCycleManager blcm =
bus.getExtension(BusLifeCycleManager.class);
+ if (blcm != null) {
+ listener = new JMSBusLifeCycleListener(this,
+ blcm);
+ }
+ }
+ }
+
/**
* When a message is received on the reply destination the correlation map
is searched for the
* correlationId. If it is found the message is converted to a CXF message
and the thread sending the
@@ -208,9 +273,16 @@
}
public void close() {
+ if (listener != null) {
+ listener.unreg();
+ listener = null;
+ }
if (jmsListener != null) {
jmsListener.shutdown();
}
+ if (allListener != null) {
+ allListener.shutdown();
+ }
LOG.log(Level.FINE, "JMSConduit closed ");
}
@@ -228,9 +300,16 @@
@Override
protected void finalize() throws Throwable {
+ if (listener != null) {
+ listener.unreg();
+ listener = null;
+ }
if (jmsListener != null) {
jmsListener.shutdown();
}
+ if (allListener != null) {
+ allListener.shutdown();
+ }
super.finalize();
}
Modified:
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java?rev=748608&r1=748607&r2=748608&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConfiguration.java
Fri Feb 27 17:23:32 2009
@@ -74,7 +74,7 @@
private String replyDestination;
private String messageType = JMSConstants.TEXT_MESSAGE_TYPE;
private boolean pubSubDomain;
- private boolean useConduitIdSelector = true;
+ private Boolean useConduitIdSelector;
private String conduitSelectorPrefix = "";
private boolean autoResolveDestination;
private long recoveryInterval = DEFAULT_VALUE;
@@ -332,9 +332,15 @@
}
public boolean isUseConduitIdSelector() {
+ if (useConduitIdSelector == null) {
+ return true;
+ }
return useConduitIdSelector;
}
-
+ public boolean isSetUseConduitIdSelector() {
+ return useConduitIdSelector != null;
+ }
+
public int getMaxConcurrentTasks() {
return maxConcurrentTasks;
}
Modified:
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?rev=748608&r1=748607&r2=748608&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
Fri Feb 27 17:23:32 2009
@@ -102,7 +102,8 @@
org.apache.cxf.common.i18n.Message msg =
new
org.apache.cxf.common.i18n.Message("INSUFFICIENT_CONFIGURATION_DESTINATION",
LOG, name);
jmsConfig.ensureProperlyConfigured(msg);
- jmsListener = JMSFactory.createJmsListener(jmsConfig, this,
jmsConfig.getTargetDestination(), null);
+ jmsListener = JMSFactory.createJmsListener(jmsConfig, this,
+
jmsConfig.getTargetDestination(), null, true);
}
public void deactivate() {
@@ -196,6 +197,10 @@
}
public void sendExchange(Exchange exchange, final Object replyObj) {
+ if (exchange.isOneWay()) {
+ //Don't need to send anything
+ return;
+ }
Message inMessage = exchange.getInMessage();
final Message outMessage = exchange.getOutMessage();
if (jmsConfig.isPubSubDomain()) {
Modified:
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java?rev=748608&r1=748607&r2=748608&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
Fri Feb 27 17:23:32 2009
@@ -117,7 +117,8 @@
public static DefaultMessageListenerContainer
createJmsListener(JMSConfiguration jmsConfig,
MessageListener listenerHandler,
String
destinationName,
- String
messageSelectorPrefix) {
+ String
messageSelectorPrefix,
+ boolean
userCID) {
DefaultMessageListenerContainer jmsListener = jmsConfig.isUseJms11()
? new DefaultMessageListenerContainer() : new
DefaultMessageListenerContainer102();
jmsListener.setConcurrentConsumers(jmsConfig.getConcurrentConsumers());
@@ -141,13 +142,15 @@
jmsListener.setCacheLevel(jmsConfig.getCacheLevel());
}
String staticSelectorPrefix = jmsConfig.getConduitSelectorPrefix();
- if (messageSelectorPrefix != null &&
jmsConfig.isUseConduitIdSelector()) {
- jmsListener.setMessageSelector("JMSCorrelationID LIKE '"
+ if (!userCID || jmsConfig.isSetUseConduitIdSelector()) {
+ if (messageSelectorPrefix != null &&
jmsConfig.isUseConduitIdSelector()) {
+ jmsListener.setMessageSelector("JMSCorrelationID LIKE '"
+ staticSelectorPrefix
+ messageSelectorPrefix + "%'");
- } else if (staticSelectorPrefix.length() > 0) {
- jmsListener.setMessageSelector("JMSCorrelationID LIKE '"
+ } else if (staticSelectorPrefix.length() > 0) {
+ jmsListener.setMessageSelector("JMSCorrelationID LIKE '"
+ staticSelectorPrefix + "%'");
+ }
}
if (jmsConfig.getDestinationResolver() != null) {
jmsListener.setDestinationResolver(jmsConfig.getDestinationResolver());
Modified:
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java?rev=748608&r1=748607&r2=748608&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSOldConfigHolder.java
Fri Feb 27 17:23:32 2009
@@ -96,7 +96,9 @@
//if (clientConfig.isSetClientReceiveTimeout()) {
jmsConfig.setReceiveTimeout(clientConfig.getClientReceiveTimeout());
//}
-
jmsConfig.setUseConduitIdSelector(clientConfig.isUseConduitIdSelector());
+ if (clientConfig.isSetUseConduitIdSelector()) {
+
jmsConfig.setUseConduitIdSelector(clientConfig.isUseConduitIdSelector());
+ }
if (clientConfig.isSetConduitSelectorPrefix()) {
jmsConfig.setConduitSelectorPrefix(clientConfig.getConduitSelectorPrefix());
}
Modified:
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
URL:
http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd?rev=748608&r1=748607&r2=748608&view=diff
==============================================================================
---
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
(original)
+++
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/resources/schemas/wsdl/jms.xsd
Fri Feb 27 17:23:32 2009
@@ -55,7 +55,7 @@
<xs:attribute name="messageTimeToLive" type="xs:long"
default="0" />
<xs:attribute name="conduitSelectorPrefix" type="xs:string"
use="optional" default=""/>
- <xs:attribute name="useConduitIdSelector" type="xs:boolean"
use="optional" default="true"/>
+ <xs:attribute name="useConduitIdSelector" type="xs:boolean"
use="optional"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
