diff options
| author | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-19 05:27:58 +0000 |
|---|---|---|
| committer | lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> | 2008-11-19 05:27:58 +0000 |
| commit | 5f3869c451e46aadc943d00087d6847877dd1c50 (patch) | |
| tree | e22baaff1fb9ea42606b7d04af52e032e3bc03bc /java/sca/modules/policy/src/main | |
| parent | 60744a36aae604ac3c4499ed54f1082ab8f5947d (diff) | |
Merging the 1.x delta on top of the equinox based modules
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@718858 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca/modules/policy/src/main')
3 files changed, 4 insertions, 3 deletions
diff --git a/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java index dbdef38324..0f8b1ae00a 100644 --- a/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java +++ b/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java @@ -84,6 +84,7 @@ public class BindingTypeImpl implements IntentAttachPointType { @Override
public String toString() {
- return getName().toString();
+ return ( this.typeName != null ) ? getName().toString() : "null";
}
}
+;
\ No newline at end of file diff --git a/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java index fa95d84c4e..7861fd79f9 100644 --- a/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java +++ b/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java @@ -83,6 +83,6 @@ public class ImplementationTypeImpl implements IntentAttachPointType { @Override
public String toString() {
- return getName().toString();
+ return ( this.typeName != null ) ? getName().toString() : "null";
}
}
diff --git a/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java index 4bd9d5b7c7..179a10cc1a 100644 --- a/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java +++ b/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java @@ -127,7 +127,7 @@ public class PolicySetImpl implements PolicySet { @Override public String toString() { - return getName().toString(); + return ( this.name != null ) ? getName().toString() : "null"; } public XPathExpression getAppliesToXPathExpression() { |