Change the tuscanyClient scheme to pbe all lower case so it works with the toLowerCase in the DefaultEndpointRegistryFactory, and move all the remote code in the scaclient to happen at invocation time. This now works for multiple local and remote nodes in one or separate JVMs

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

1 files changed, 4 insertions, 4 deletions

diff --git a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java
index 066ff187db..0eee731249 100644
--- a/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java
+++ b/sca-java-2.x/trunk/modules/endpoint-hazelcast/src/main/java/org/apache/tuscany/sca/endpoint/hazelcast/ConfigURI.java
@@ -59,8 +59,8 @@ public class ConfigURI {
     }

 

     private void parseURI(String uri) {

-        if (uri.startsWith("tuscanyClient:")) {

-            uri = uri.replace("tuscanyClient:", "tuscany:");    

+        if (uri.startsWith("tuscanyclient:")) {

+            uri = uri.replace("tuscanyclient:", "tuscany:");    

         }

         

         if (!uri.startsWith("tuscany:")) {

@@ -69,10 +69,10 @@ public class ConfigURI {
         

         // make it a URI so java.net.URI can be used to parse it

         int i = uri.indexOf(":");

-        if (uri.charAt("tuscany:".length()+1) != '/') {

+        if (uri.charAt("tuscany:".length()) != '/') {

             uri = uri.replaceFirst(":", ":/");

         }

-        if (uri.charAt("tuscany:".length()+2) != '/') {

+        if (uri.charAt("tuscany:".length()+1) != '/') {

             uri = uri.replaceFirst(":/", "://");

         }

         URI configURI = URI.create(uri);