[jbossws-commits] JBossWS SVN: r17190 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref and 2 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Tue Jan 8 04:59:06 EST 2013
Author: alessio.soldano at jboss.com
Date: 2013-01-08 04:59:06 -0500 (Tue, 08 Jan 2013)
New Revision: 17190
Modified:
stack/cxf/branches/jbossws-cxf-4.0.x/
stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
Log:
Merged revisions 17067 via svnmerge from
https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
.......
r17067 | alessio.soldano at jboss.com | 2012-12-11 15:30:36 +0100 (Tue, 11 Dec 2012) | 2 lines
Few fixes / improvements
.......
Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
- https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15883,15885-15896,15900-15920,15936,15965,15967,15973,16067-16075,16077-16083,16085-16087,16091-16093,16095-16096,16098-16100,16103-16107,16111-16121,16124-16126,16128-16157,16159-16160,16162-16163,16165-16183,16204-16225,16227,16230-16234,16241,16243-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16696-16698,16702-16703,16705,16710-16711,16717,16719-16730,16732-16738,16782,16817,16914-16915,16918,16921-16923,16925-16928,16932-16937,16939-16941,16943-16946,16951,16953-16980,16982-17008,17011-17021,17023,17026-17037,17039-17040,17042,17044-17050,17053-17056,17058,17061
+ https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748-15757,15765-15766,15768,15770-15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15883,15885-15896,15900-15920,15936,15965,15967,15973,16067-16075,16077-16083,16085-16087,16091-16093,16095-16096,16098-16100,16103-16107,16111-16121,16124-16126,16128-16157,16159-16160,16162-16163,16165-16183,16204-16225,16227,16230-16234,16241,16243-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16696-16698,16702-16703,16705,16710-16711,16717,16719-16730,16732-16738,16782,16817,16914-16915,16918,16921-16923,16925-16928,16932-16937,16939-16941,16943-16946,16951,16953-16980,16982-17008,17011-17021,17023,17026-17037,17039-17040,17042,17044-17050,17053-17056,17058,17061,17067
Modified: svn:mergeinfo
- /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061
+ /stack/cxf/branches/asoldano:14032-14050,14068
/stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061,17067
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2013-01-08 09:36:33 UTC (rev 17189)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/client/src/main/java/org/jboss/wsf/stack/cxf/client/serviceref/CXFHandlerResolverImpl.java 2013-01-08 09:59:06 UTC (rev 17190)
@@ -160,7 +160,6 @@
throw new WebServiceException(BundleUtils.getMessage(bundle, "HANDLER_CHAINS_ELEMENT_EXPECTED"));
}
- chain = new ArrayList<Handler>();
Node node = el.getFirstChild();
while (node != null) {
if (node instanceof Element) {
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-01-08 09:36:33 UTC (rev 17189)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/configuration/BusHolder.java 2013-01-08 09:59:06 UTC (rev 17190)
@@ -24,6 +24,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.cxf.Bus;
import org.apache.cxf.binding.soap.SoapTransportFactory;
@@ -178,7 +179,8 @@
Map<String, String> props = wsmd.getProperties();
if (props != null && !props.isEmpty()) {
Map<String, Map<String, String>> queuesMap = new HashMap<String, Map<String,String>>();
- for (final String k : props.keySet()) {
+ for (Entry<String, String> e : props.entrySet()) {
+ String k = e.getKey();
if (k.startsWith(Constants.CXF_QUEUE_PREFIX)) {
String sk = k.substring(Constants.CXF_QUEUE_PREFIX.length());
int i = sk.indexOf(".");
@@ -190,13 +192,14 @@
m = new HashMap<String, String>();
queuesMap.put(queueName, m);
}
- m.put(queueProp, props.get(k));
+ m.put(queueProp, e.getValue());
}
}
}
WorkQueueManager mgr = bus.getExtension(WorkQueueManager.class);
- for (String queueName : queuesMap.keySet()) {
- AutomaticWorkQueue q = createWorkQueue(queueName, queuesMap.get(queueName));
+ for (Entry<String, Map<String, String>> e : queuesMap.entrySet()) {
+ final String queueName = e.getKey();
+ AutomaticWorkQueue q = createWorkQueue(queueName, e.getValue());
mgr.addNamedWorkQueue(queueName, q);
}
}
@@ -235,7 +238,7 @@
this.bus = bus;
}
- private class BusHolderLifeCycleListener implements BusLifeCycleListener
+ private static class BusHolderLifeCycleListener implements BusLifeCycleListener
{
private volatile boolean preShutdown = false;
Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java
===================================================================
--- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2013-01-08 09:36:33 UTC (rev 17189)
+++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/services/DDBeans.java 2013-01-08 09:59:06 UTC (rev 17190)
@@ -86,8 +86,14 @@
File tmpDir = IOUtils.createTempDirectory();
tmpFile = File.createTempFile("jbossws-cxf", ".xml", tmpDir);
Writer writer = new OutputStreamWriter(new FileOutputStream(tmpFile));
- writeTo(writer);
- writer.close();
+ try
+ {
+ writeTo(writer);
+ }
+ finally
+ {
+ writer.close();
+ }
return tmpFile.toURI().toURL();
}
More information about the jbossws-commits
mailing list