You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2016/02/02 19:06:39 UTC

cxf git commit: change the warning-log condition to handle both wsam-namespaces equally

Repository: cxf
Updated Branches:
  refs/heads/master 53a462058 -> 62ebb2a0b


change the warning-log condition to handle both wsam-namespaces equally


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/62ebb2a0
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/62ebb2a0
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/62ebb2a0

Branch: refs/heads/master
Commit: 62ebb2a0b5f0f9683dcb3a62f03a8e4eaf6da736
Parents: 53a4620
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Tue Feb 2 18:51:43 2016 +0100
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Tue Feb 2 18:52:10 2016 +0100

----------------------------------------------------------------------
 .../cxf/ws/addressing/policy/AddressingAssertionBuilder.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/62ebb2a0/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
----------------------------------------------------------------------
diff --git a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
index e49dac9..318463d 100644
--- a/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
+++ b/rt/ws/addr/src/main/java/org/apache/cxf/ws/addressing/policy/AddressingAssertionBuilder.java
@@ -85,8 +85,8 @@ public class AddressingAssertionBuilder implements AssertionBuilder<Element> {
                                                   policy);
                 }
             }.build(elem, factory);
-            if (!MetadataConstants.ADDRESSING_ASSERTION_QNAME.equals(nap.getName())) {
-                // this happens when neethi fails to recognize the specified addressing policy
+            if (!(nap instanceof PolicyContainingPrimitiveAssertion || nap instanceof PrimitiveAssertion)) {
+                // this happens when neethi fails to recognize the specified addressing policy element
                 LOG.warning("Unable to recognize the addressing policy");
             }
             return nap;