Author: dkulp
Date: Mon Sep 17 09:50:16 2007
New Revision: 576516
URL: http://svn.apache.org/viewvc?rev=576516&view=rev
Log:
Fix issue if two ops have the same soapAction that is not "", it grabs a random
operation.
Add svn:ignore to javato/ws
Modified:
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
incubator/cxf/trunk/tools/javato/ws/ (props changed)
Modified:
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java?rev=576516&r1=576515&r2=576516&view=diff
==============================================================================
---
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
(original)
+++
incubator/cxf/trunk/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/interceptor/SoapActionInInterceptor.java
Mon Sep 17 09:50:16 2007
@@ -91,14 +91,22 @@
Exchange ex = message.getExchange();
Endpoint ep = ex.get(Endpoint.class);
+ BindingOperationInfo bindingOp = null;
+
Collection<BindingOperationInfo> bops =
ep.getBinding().getBindingInfo().getOperations();
for (BindingOperationInfo boi : bops) {
SoapOperationInfo soi = (SoapOperationInfo)
boi.getExtensor(SoapOperationInfo.class);
if (soi != null && soi.getAction().equals(action)) {
- ex.put(BindingOperationInfo.class, boi);
- ex.put(OperationInfo.class, boi.getOperationInfo());
- return;
+ if (bindingOp != null) {
+ //more than one op with the same action, will need to
parse normally
+ return;
+ }
+ bindingOp = boi;
}
+ }
+ if (bindingOp != null) {
+ ex.put(BindingOperationInfo.class, bindingOp);
+ ex.put(OperationInfo.class, bindingOp.getOperationInfo());
}
}
Propchange: incubator/cxf/trunk/tools/javato/ws/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 17 09:50:16 2007
@@ -0,0 +1,10 @@
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
+.classpath
+.project
+.wtpmodules
+
+
