Author: slaws
Date: Tue Jul 27 12:53:46 2010
New Revision: 979685
URL: http://svn.apache.org/viewvc?rev=979685&view=rev
Log:
Correct the policy subject that is checked during "appliesTo" processing. Fix
for ASM_10002 regression.
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAppliesToBuilderImpl.java
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAppliesToBuilderImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAppliesToBuilderImpl.java?rev=979685&r1=979684&r2=979685&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAppliesToBuilderImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/PolicyAppliesToBuilderImpl.java
Tue Jul 27 12:53:46 2010
@@ -96,7 +96,7 @@ public class PolicyAppliesToBuilderImpl
for (ComponentService componentService :
component.getServices()) {
for (Endpoint ep : componentService.getEndpoints()) {
- checkAppliesToSubject(document,
appliesToSubjects, topComposite, (PolicySubject)ep, ep.getPolicySets());
+ checkAppliesToSubject(document,
appliesToSubjects, topComposite, (PolicySubject)ep.getService(),
ep.getPolicySets());
if (ep.getBinding() instanceof PolicySubject) {
checkAppliesToSubject(document,
appliesToSubjects, topComposite, (PolicySubject)ep.getBinding(),
ep.getPolicySets());
}
@@ -105,7 +105,7 @@ public class PolicyAppliesToBuilderImpl
for (ComponentReference componentReference :
component.getReferences()) {
for (EndpointReference epr :
componentReference.getEndpointReferences()) {
- checkAppliesToSubject(document,
appliesToSubjects, topComposite, (PolicySubject)epr, epr.getPolicySets());
+ checkAppliesToSubject(document,
appliesToSubjects, topComposite, (PolicySubject)epr.getReference(),
epr.getPolicySets());
if (epr.getBinding() instanceof PolicySubject) {
checkAppliesToSubject(document,
appliesToSubjects, topComposite, (PolicySubject)epr.getBinding(),
epr.getPolicySets());
}