git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@702995 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 3 insertions, 3 deletions

diff --git a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index a0ec95023a..9dd26b5e8e 100644
--- a/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
@@ -148,6 +148,6 @@ public class CompositeImpl extends ImplementationImpl implements Composite, Clon
     
     @Override
     public String toString(){
-        return getName().toString();
+    	return ( this.name != null ) ? getName().toString() : "null";
     }
 }
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() {