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/07/11 21:11:50 UTC
[7/7] git commit: Fix compile error after merge
Fix compile error after merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ce7a84f5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ce7a84f5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ce7a84f5
Branch: refs/heads/2.6.x-fixes
Commit: ce7a84f5d938c309b3cde12beb963092c1ee4642
Parents: 958bd74
Author: Daniel Kulp <dk...@apache.org>
Authored: Fri Jul 11 15:10:42 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Fri Jul 11 15:10:42 2014 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/cxf/jaxws/DispatchImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ce7a84f5/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
index aa9061b..fd69e1b 100644
--- a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
+++ b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/DispatchImpl.java
@@ -344,18 +344,18 @@ public class DispatchImpl<T> implements Dispatch<T>, BindingProvider, Closeable
// if the addressing feature is enabled, set findDispatchOp to true
if (!findDispatchOp) {
// the feature list to be searched is the endpoint and the bus's lists
- List<Feature> endpointFeatures
+ List<AbstractFeature> endpointFeatures
= ((JaxWsClientEndpointImpl)client.getEndpoint()).getFeatures();
- List<Feature> allFeatures;
+ List<AbstractFeature> allFeatures;
if (client.getBus().getFeatures() != null) {
- allFeatures = new ArrayList<Feature>(endpointFeatures.size()
+ allFeatures = new ArrayList<AbstractFeature>(endpointFeatures.size()
+ client.getBus().getFeatures().size());
allFeatures.addAll(endpointFeatures);
allFeatures.addAll(client.getBus().getFeatures());
} else {
allFeatures = endpointFeatures;
}
- for (Feature feature : allFeatures) {
+ for (AbstractFeature feature : allFeatures) {
if (feature instanceof WSAddressingFeature) {
findDispatchOp = true;
}