svn commit: r550175 - in /webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart: PolicyBasedResultsValidator.java RampartMessageData.java

[ruchithf]

Author: ruchithf
Date: Sun Jun 24 00:58:33 2007
New Revision: 550175

URL: http://svn.apache.org/viewvc?view=rev&rev=550175
Log:
If there's no policy then do not add security header

Modified:
    
webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
    
webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java

Modified: 
webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?view=diff&rev=550175&r1=550174&r2=550175
==============================================================================
--- 
webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
 (original)
+++ 
webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
 Sun Jun 24 00:58:33 2007
@@ -52,6 +52,12 @@
         
         RampartPolicyData rpd = rmd.getPolicyData();
         
+        //If there's Security policy present and no results 
+        //then we should throw an error
+        if(rpd != null && results == null) {
+            throw new RampartException("noSecurityResults");
+        }
+        
         //Check presence of timestamp
         WSSecurityEngineResult tsResult = null;
         if(rpd.isIncludeTimestamp()) {

Modified: 
webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?view=diff&rev=550175&r1=550174&r2=550175
==============================================================================
--- 
webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
 (original)
+++ 
webservices/rampart/branches/java/1_2/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
 Sun Jun 24 00:58:33 2007
@@ -299,7 +299,7 @@
 
             this.customClassLoader = msgCtx.getAxisService().getClassLoader();
             
-            if(this.policyData != null) {
+            if(this.sender && this.policyData != null) {
                 this.secHeader = new WSSecHeader();
                 secHeader.insertSecurityHeader(this.document);
             }