Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 8709d976f -> d26f7af22


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/d26f7af2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d26f7af2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d26f7af2

Branch: refs/heads/3.1.x-fixes
Commit: d26f7af22662873b43e26a40e21477c0546ca13c
Parents: 8709d97
Author: Akitoshi Yoshida <a...@apache.org>
Authored: Tue Feb 2 18:51:43 2016 +0100
Committer: Akitoshi Yoshida <a...@apache.org>
Committed: Tue Feb 2 19:06:58 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/d26f7af2/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;

Reply via email to