Re: svn commit: r1071879 - in /cxf/trunk: api/src/main/java/org/apache/cxf/ws/policy/ api/src/main/java/org/apache/cxf/ws/policy/builder/primitive/ api/src/test/java/org/apache/cxf/ws/policy/ api/src/test/java/org/apache/cxf/ws/policy/builder/primitive/ rt...

[Glen Mazza]

On 2/17/2011 11:20 PM, dk...@apache.org wrote:

Author: dkulp
Date: Fri Feb 18 04:20:06 2011
New Revision: 1071879

URL: http://svn.apache.org/viewvc?rev=1071879&view=rev
Log:
Push more stuff to Neethi
Cleanup some policy API's


Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java?rev=1071879&r1=1071878&r2=1071879&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java 
(original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/ws/policy/AssertionInfoMap.java 
Fri Feb 18 04:20:06 2011
@@ -95,9 +95,8 @@ public class AssertionInfoMap extends Ha
              Assertion ass = (Assertion)assertion;
              Collection<AssertionInfo>  ail = getAssertionInfo(ass.getName());
              for (AssertionInfo ai : ail) {
-                if (ai.isAsserted()&&  ai.getAssertion() == ass) {
-                    return true;
-                } else if (!ass.isOptional()) {
+                if (ai.getAssertion().equal(ass)
+&&  !ai.isAsserted()&&  !ass.isOptional()) {
                      errors.add(ass.getName());
                      pass = false;
                  }

Can we add something to Checkstyle to prohibit variables named "ass"?   :)

Glen