You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by am...@apache.org on 2009/03/13 09:46:05 UTC

svn commit: r753167 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java

Author: amilas
Date: Fri Mar 13 08:46:04 2009
New Revision: 753167

URL: http://svn.apache.org/viewvc?rev=753167&view=rev
Log:
getting the policy in new way

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?rev=753167&r1=753166&r2=753167&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/description/AxisBinding.java Fri Mar 13 08:46:04 2009
@@ -243,14 +243,13 @@
     
     public Policy getEffectivePolicy() {
         ArrayList<PolicyComponent> policyList = new ArrayList<PolicyComponent>();
-        policyList.addAll(getPolicyInclude().getAttachedPolicies());
+        policyList.addAll(getPolicySubject().getAttachedPolicyComponents());
      
         // AxisEndpoint
         AxisEndpoint axisEndpoint = getAxisEndpoint();
         
         if (axisEndpoint != null) {
-            policyList.addAll(axisEndpoint.getPolicyInclude()
-                    .getAttachedPolicies());
+            policyList.addAll(axisEndpoint.getPolicySubject().getAttachedPolicyComponents());
         }
         
         AxisService service = null;
@@ -260,9 +259,9 @@
         }
         
         if (service != null) {
-            Policy effectivePolicy = service.getPolicyInclude().getEffectivePolicy();
-            if (effectivePolicy != null) {
-                policyList.add(effectivePolicy);
+            PolicySubject servicePolicySubject = service.getPolicySubject();
+            if (servicePolicySubject != null) {
+                policyList.addAll(servicePolicySubject.getAttachedPolicyComponents());
             }
         }