You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/07 18:57:09 UTC
[1/4] git commit: Recording .gitmergeinfo Changes
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 6ea206160 -> 3ac8156da
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3ac8156d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3ac8156d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3ac8156d
Branch: refs/heads/3.0.x-fixes
Commit: 3ac8156da02c943cf00303494c78b8c968a416ca
Parents: c2890af
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 7 12:40:20 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 12:57:02 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3ac8156d/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b13fde0..fd9b665 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -1,5 +1,6 @@
origin/master
+B 04f0ef2e32f55d51f14cfc6d7a14616b62a6cce5
B 08d98fbb13440de2da3b19915d8dfe21531cb284
B 0aaa2b5742a53bf31704939e4bc21906100bbc54
B 0c0555f4ac850ec8e38302d73207170affe4376a
@@ -9,11 +10,14 @@ B 13dfe0f9fcaa0aee4c603072436d85861a0ab734
B 161e10bb2d87573974b8a1748f023c47ebbe5d49
B 162bbb5ea63cfeb6c258d750627c77c9e694f928
B 1674e7fb3353fc9e5d2b81deb2d02617cc09a373
+B 1805027c9ce9925fb875e92fc5314aa826632151
B 1824d9cae26c3b141d873d0d01036602ac339c37
B 1b3f01b4f640beea1f1247416ad9891e615f816c
B 1d29dfaa8e686570c1b2ec2da4c31ba380e0b9b0
+B 1e927cdfaafb2efc8d29184cb5b7b05ce3c3ad7f
B 2004b1021ce0d0975eb49cae36416863bd8c59bb
B 2afb9d3cacb299bea854d1ff4824e4c981a41d6a
+B 2ba77327488a8446e6a92af137f644eaf3b06e2e
B 384ad75433037358ea1607c4ddcb0cd978fae10c
B 38bb9fea460262ff2781cbfdf85032d3f4fb9fe1
B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300
@@ -27,10 +31,14 @@ B 4f70bdf4199a666829cf9c6c62c508d12afbe251
B 51f433d54a1d11eac25c32b0dd69f12fef62c060
B 5fbd407bac5af5e55bb280125405d75b7add872b
B 6256b7c7c42bb01d2cc0d16d659ba1aa3042e7ae
+B 64f232307444269286b7f14fc3838b07187d4c03
+B 665eb259fced741f65de061bb026c3ab65a8d99c
B 66cc4a4e3c0e92d9e6931a5d416f11c2f07f268c
B 67432aef1adb8e330c054431de9d0955e3993472
B 69176e3dd7c69901d03f6d93bb365df784f06525
+B 698cd0483b99f9638ce05557e1137ffce86d4185
B 6e4f0f60785de1f5774644323edafb4741b9e4a4
+B 702f27bc4a334b2d117262252632bf580f20f711
B 71488c6fa7635c88285214a0479379aafef9ed3c
B 75c69b27a7688dfac281d4acdcff3b0acc4c8bee
B 7e318c4fbfae35680965082a491ca842a23ffd8c
@@ -44,10 +52,14 @@ B 8f967643447ceec89e58b079d8d8fc00cf232a02
B 90312bc48f6e564bcafdaaebc3cd596c966ee674
B 91d6630c53f222544e4bb512fb5c918d68518138
B 92c4738f9e6b96fe0ce8586bb36b9c6444d6e225
+B 9344b093b8081a68c9f83f0c740d60508e99fd5e
B 944eb0ba1043bd4daf9cf087b66bc9cab10b8ff2
+B 99963f9a08c9782b7c661f2b5ff8e9ce95ab3dbe
B 9ea935fcbf3869f5fa4fd1e75a0a2309cc780415
+B 9fe4c04a1c875b3e8f402268cd9dfe18431b5cc9
B a2855695896d5084ea288b0fa47457e4b7bfac38
B a4315cb442fa31960cbd47f11e95e81b4a71441d
+B a5aff3e7a43274b3d47cda706aaf8108bd7a9b07
B a5f8a4dd4d9ecbfc1f8a1a8e5bcb4af17f561cc5
B a7b79ea692add4f9da0f1232e3bfb338099f4147
B b4536602d376a36bcbd02d21d5ab42f19d4e5b22
@@ -55,6 +67,8 @@ B b5fc90f09c6b039a54564e0825a264310453c550
B b67537dbace0896073b55b375b8ccdc4cce83365
B ba8fc3d351121ec8eb2ce37cd12e014f722c741d
B bb1edc5dd96c50ed2c3294f6834310e0a6d4381e
+B bcf0c9f825a7b8d1c86405403d7c089fea2955c0
+B bea22d764138e365513856c23be760a7719530a0
B c044f726fae2a2f35ce5c6c3b9ebbfe54125ad11
B d0c5c3defab6dbb9619f8fd291f2e06b685cb03c
B d391d9371d8505c7774308c4fbbb9bc57ffd34a6
@@ -76,6 +90,10 @@ B ff742436a3e177dc61106edf08f2509e727362dd
B ffd429be404953874e141c52a9c8ba46812d73ca
M 18a3d43cb0044fcb84d3cc89f138fd9e7110dd04
M 43c8d500b04a13f72077751fdbfaab7bbcfbbf8f
+M 4640cf1ea20eee09ae650b706bce765a16affc8b
+M 47b57d723f1468e9d9650617a6013edf4f965900
+M 51db79ca7bd2c703a4dbbd42d7761c97af3bad84
+M 6129ec5f6735a986660a2d05c6b3b0c9230610d9
M 6292346fb110f0517b791f91d03fd2515d575388
M 64368a5ddad507fa5d7016cbd07f3e9b5b5fd594
M 67201fdde69488e511deb3d24794984afc01fe2d
@@ -85,6 +103,7 @@ M 98f65f2911e063e70e864e7614b062cc124a0f9d
M a64ded455c40169665e438ae7a25f17bd4f8047a
M af2f7d3a52076f60d0f98a2635e2adef256a9efe
M bee82ba7d1766b555d965a75b3846ead4686239e
+M c34bf7ad6bc55b6584dfd009f49a3f4eb8ececc9
M c55664128b1223667dedacc2011ccd5945d9c8b9
M d2dec5b87788b8cb5059d3719cf3dfd7135a1280
M f02b02934bf78504ffc462c364dc43e386e727b2
[4/4] git commit: [/CXF-6019]: original exception isn't logged by
exceptions in WSDL parser
Posted by dk...@apache.org.
[/CXF-6019]: original exception isn't logged by exceptions in WSDL parser
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/94022f9c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/94022f9c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/94022f9c
Branch: refs/heads/3.0.x-fixes
Commit: 94022f9c2b089fa3e85072936d600abc57666429
Parents: 6ea2061
Author: Andrei Shakirin <an...@gmail.com>
Authored: Tue Sep 23 09:34:30 2014 +0200
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 12:57:02 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/94022f9c/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
----------------------------------------------------------------------
diff --git a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
index 2a2f7ce..cdedc6d 100644
--- a/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
+++ b/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/WSDLGetUtils.java
@@ -31,6 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
import java.util.logging.Logger;
import javax.wsdl.Definition;
@@ -52,9 +53,7 @@ import javax.xml.transform.dom.DOMSource;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
import org.xml.sax.InputSource;
-
import org.apache.cxf.Bus;
import org.apache.cxf.catalog.OASISCatalogManager;
import org.apache.cxf.catalog.OASISCatalogManagerHelper;
@@ -155,6 +154,7 @@ public class WSDLGetUtils {
} catch (WSDLQueryException wex) {
throw wex;
} catch (Exception wex) {
+ LOG.log(Level.SEVERE, wex.getMessage(), wex);
throw new WSDLQueryException(new org.apache.cxf.common.i18n.Message("COULD_NOT_PROVIDE_WSDL",
LOG,
base), wex);
[2/4] git commit: Add a test for the possible growing MAPCodec leak
Posted by dk...@apache.org.
Add a test for the possible growing MAPCodec leak
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/96e6fa6b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/96e6fa6b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/96e6fa6b
Branch: refs/heads/3.0.x-fixes
Commit: 96e6fa6b664d8dfb1f5a5662a0907cfb60682da5
Parents: 94022f9
Author: Daniel Kulp <dk...@apache.org>
Authored: Wed Sep 24 19:34:01 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 12:57:02 2014 -0400
----------------------------------------------------------------------
.../cxf/systest/ws/addr_wsdl/AddNumberImpl.java | 7 +++
.../systest/ws/addr_wsdl/WSAPureWsdlTest.java | 63 ++++++++++++++++++++
2 files changed, 70 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/96e6fa6b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/AddNumberImpl.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/AddNumberImpl.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/AddNumberImpl.java
index e69539d..1f29d56 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/AddNumberImpl.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/AddNumberImpl.java
@@ -48,6 +48,13 @@ public class AddNumberImpl implements AddNumbersPortType {
}
int execute(int number1, int number2) throws AddNumbersFault_Exception {
+ if (number1 == 5092) {
+ try {
+ Thread.sleep(2000);
+ } catch (InterruptedException e) {
+ //ignore
+ }
+ }
if (number1 < 0 || number2 < 0) {
AddNumbersFault fb = new AddNumbersFault();
fb.setDetail("Negative numbers cant be added!");
http://git-wip-us.apache.org/repos/asf/cxf/blob/96e6fa6b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
index 51e333b..d82c6ad 100644
--- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
+++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java
@@ -28,6 +28,7 @@ import java.util.concurrent.ExecutionException;
import javax.xml.namespace.QName;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.AsyncHandler;
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Dispatch;
import javax.xml.ws.Response;
@@ -43,6 +44,7 @@ import org.apache.cxf.systest.ws.AbstractWSATestBase;
import org.apache.cxf.systest.ws.addr_feature.AddNumbersPortType;
import org.apache.cxf.systest.ws.addr_feature.AddNumbersResponse;
import org.apache.cxf.systest.ws.addr_feature.AddNumbersService;
+import org.apache.cxf.transport.http.HTTPConduit;
import org.apache.cxf.ws.addressing.ContextUtils;
import org.apache.cxf.ws.addressing.soap.MAPCodec;
@@ -52,6 +54,7 @@ import org.junit.Test;
public class WSAPureWsdlTest extends AbstractWSATestBase {
static final String PORT = allocatePort(Server.class);
+ static final String PORT2 = allocatePort(Server.class, 1);
private final QName serviceName = new QName("http://apache.org/cxf/systest/ws/addr_feature/",
"AddNumbersService");
@@ -67,6 +70,66 @@ public class WSAPureWsdlTest extends AbstractWSATestBase {
}
@Test
+ public void testBasicInvocationTimeouts() throws Exception {
+ AddNumbersPortType port = getPort();
+
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:" + PORT + "/jaxws/add");
+ HTTPConduit conduit = (HTTPConduit)((Client)port).getConduit();
+ conduit.getClient().setConnectionTimeout(25);
+ conduit.getClient().setReceiveTimeout(10);
+
+ try {
+ //read timeout
+ port.addNumbersAsync(5092, 25).get();
+ fail("should have failed");
+ } catch (Exception t) {
+ //expected
+ assertTrue(t.getCause().toString(), t.getCause() instanceof java.net.SocketTimeoutException);
+ }
+
+ AsyncHandler<AddNumbersResponse> handler = new AsyncHandler<AddNumbersResponse>() {
+ public void handleResponse(Response<AddNumbersResponse> res) {
+ //System.out.println("in handle response");
+ synchronized (this) {
+ notifyAll();
+ }
+ }
+ };
+ synchronized (handler) {
+ port.addNumbersAsync(5092, 25, handler);
+ handler.wait(1000);
+ }
+
+ try {
+ //connection timeout
+ ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ "http://localhost:" + PORT2 + "/jaxws/add");
+ port.addNumbersAsync(25, 25).get();
+ fail("should have failed");
+ } catch (Exception t) {
+ //expected
+ assertTrue(t.getCause().getCause().toString(),
+ t.getCause().getCause() instanceof java.net.ConnectException);
+ }
+ synchronized (handler) {
+ port.addNumbersAsync(25, 25, handler);
+ handler.wait(1000);
+ }
+ MAPCodec mp = getMAPCodec((Client)port);
+ assertEquals(0, mp.getUncorrelatedExchanges().size());
+ }
+
+ MAPCodec getMAPCodec(Client port) {
+ for (Interceptor<? extends Message> f : port.getOutInterceptors()) {
+ if (f instanceof MAPCodec) {
+ return (MAPCodec)f;
+ }
+ }
+ return null;
+ }
+
+ @Test
public void testBasicInvocation() throws Exception {
ByteArrayOutputStream input = setupInLogging();
ByteArrayOutputStream output = setupOutLogging();
[3/4] git commit: [CXF-6010] Fix potential NPE Patch from Eirik
Bjorsnos applied
Posted by dk...@apache.org.
[CXF-6010] Fix potential NPE
Patch from Eirik Bjorsnos applied
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c2890afa
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c2890afa
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c2890afa
Branch: refs/heads/3.0.x-fixes
Commit: c2890afae1d7e366973507f8524c807f7af7dee7
Parents: 96e6fa6
Author: Daniel Kulp <dk...@apache.org>
Authored: Tue Oct 7 10:24:30 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Tue Oct 7 12:57:02 2014 -0400
----------------------------------------------------------------------
.../interceptors/MessageModeOutInterceptor.java | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c2890afa/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
index dd82c9c..815558a 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/interceptors/MessageModeOutInterceptor.java
@@ -202,16 +202,18 @@ public class MessageModeOutInterceptor extends AbstractPhaseInterceptor<Message>
}
}
private void validateFaultDetail(Element detail, Schema schema, BindingOperationInfo bop) throws Exception {
- Element el = DOMUtils.getFirstElement(detail);
- while (el != null) {
- QName qn = DOMUtils.getElementQName(el);
- for (BindingFaultInfo bfi : bop.getFaults()) {
- if (bfi.getFaultInfo().getMessagePartByIndex(0).getConcreteName().equals(qn)) {
- //Found a fault with the correct QName, we can validate it
- schema.newValidator().validate(new DOMSource(el));
+ if (detail != null) {
+ Element el = DOMUtils.getFirstElement(detail);
+ while (el != null) {
+ QName qn = DOMUtils.getElementQName(el);
+ for (BindingFaultInfo bfi : bop.getFaults()) {
+ if (bfi.getFaultInfo().getMessagePartByIndex(0).getConcreteName().equals(qn)) {
+ //Found a fault with the correct QName, we can validate it
+ schema.newValidator().validate(new DOMSource(el));
+ }
}
+ el = DOMUtils.getNextElement(el);
}
- el = DOMUtils.getNextElement(el);
}
}
private void validateFault(SoapMessage message, SOAPFault fault, BindingOperationInfo bop) {