1 files changed, 12 insertions, 4 deletions
diff --git a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
index 396d77af66..67486b0ab3 100644
--- a/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
+++ b/java/sca/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeUtil.java
@@ -47,10 +47,18 @@ public class NodeUtil {
      * @return
      */
     static URI createURI(String uri) {
-        if (uri.indexOf(' ') != -1) {
-            uri = uri.replace(" ", "%20");
-        }
-        return URI.create(uri);
+    	URI returnURI = null;
+    	
+    	try {
+    		returnURI = URI.create(uri);
+    	} catch( Exception e) {
+    		try {
+    			returnURI = new URI(null, uri, null);
+    		} catch (Exception ee) {
+    			throw new IllegalArgumentException("Invalid URI :" + uri, ee);
+    		}
+    	}
+    	return returnURI;
     }
 
 }