Fix for ASM-12012. If there is nothing stored in the monitor artifact name then use the artifact name passed in as a parameter

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

1 files changed, 4 insertions, 1 deletions

diff --git a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
index bd5731c594..6de25d4eeb 100644
--- a/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
+++ b/java/sca/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/ValidatingXMLStreamReader.java
@@ -118,10 +118,13 @@ class ValidatingXMLStreamReader extends StreamReaderDelegate implements XMLStrea
             }
             
             private String getArtifactName( String input ) {
-            	String artifactName = input;
+            	String artifactName = null;
             	if( ValidatingXMLStreamReader.this.monitor != null ) {
             		artifactName = ValidatingXMLStreamReader.this.monitor.getArtifactName();
             	}
+            	if (artifactName == null){
+            	    artifactName = input;
+            	}
             	return artifactName;
             }
         });