Author: ruchithf
Date: Thu Jun 28 10:31:34 2007
New Revision: 551629
URL: http://svn.apache.org/viewvc?view=rev&rev=551629
Log:
Getting rid of policy buggy caching
Modified:
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/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=551629&r1=551628&r2=551629
==============================================================================
---
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
Thu Jun 28 10:31:34 2007
@@ -173,27 +173,10 @@
}
}
- //If the policy is already available in the service, then use it
- String msgPolicyKey = getMessagePolicyKey(msgCtx);
- if(msgCtx.getProperty(msgPolicyKey) != null) {
- this.servicePolicy = (Policy)msgCtx.getProperty(msgPolicyKey);
- }
-
- String operationPolicyKey = getOperationPolicyKey(msgCtx);
- if(msgCtx.getProperty(operationPolicyKey) != null) {
- this.servicePolicy =
(Policy)msgCtx.getProperty(operationPolicyKey);
- }
-
- String svcPolicyKey = getServicePolicyKey(msgCtx);
- if(this.servicePolicy == null && msgCtx.getProperty(svcPolicyKey)
!= null) {
- this.servicePolicy = (Policy)msgCtx.getProperty(svcPolicyKey);
- }
-
if(msgCtx.getProperty(KEY_RAMPART_POLICY) != null) {
this.servicePolicy =
(Policy)msgCtx.getProperty(KEY_RAMPART_POLICY);
}
-
/*
* Init policy:
* When creating the RampartMessageData instance we
@@ -211,14 +194,6 @@
OMElement policyElem =
param.getParameterElement().getFirstElement();
this.servicePolicy = PolicyEngine.getPolicy(policyElem);
}
-
- //Set the policy in the config ctx
- msgCtx.getConfigurationContext().setProperty(
- RampartMessageData.getServicePolicyKey(msgCtx),
this.servicePolicy);
- }
-
- if(this.isInitiator && this.servicePolicy != null) {
-
msgCtx.getServiceContext().setProperty(RampartMessageData.KEY_RAMPART_POLICY,
this.servicePolicy);
}
if(this.servicePolicy != null){
