axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ruchi...@apache.org
Subject svn commit: r382129 - in /webservices/axis2/trunk/java/modules/security: project.xml src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
Date Wed, 01 Mar 2006 19:18:28 GMT
Author: ruchithf
Date: Wed Mar  1 11:18:27 2006
New Revision: 382129

URL: http://svn.apache.org/viewcvs?rev=382129&view=rev
Log:
Fixed the test faliure

Modified:
    webservices/axis2/trunk/java/modules/security/project.xml
    webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java

Modified: webservices/axis2/trunk/java/modules/security/project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/project.xml?rev=382129&r1=382128&r2=382129&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/project.xml (original)
+++ webservices/axis2/trunk/java/modules/security/project.xml Wed Mar  1 11:18:27 2006
@@ -220,10 +220,6 @@
             <includes>
                 <include>**/*Test.java</include>
             </includes>
-            <excludes>
-                <exclude>**/*Abstract*.java</exclude>
-                <exclude>**/WSSPolicyProcessorTest.java</exclude>
-            </excludes>
         </unitTest>
 	</build>
     <reports/>

Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java?rev=382129&r1=382128&r2=382129&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
(original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/ws/security/policy/parser/WSSPolicyProcessor.java
Wed Mar  1 11:18:27 2006
@@ -162,6 +162,7 @@
                 merged = newPolicy;
             } else {
                 merged = (Policy) merged.merge(newPolicy);
+                merged = (Policy) merged.normalize();
             }
             try {
                 fis.close();



Mime
View raw message