svn commit: r835172 - /incubator/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java

[cw...@apache.org]

Author: cwiklik
Date: Thu Nov 12 00:34:50 2009
New Revision: 835172

URL: http://svn.apache.org/viewvc?rev=835172&view=rev
Log:
UIMA-1657 Removed chooseServerURI and a reference to it

Modified:
    incubator/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java

Modified: incubator/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java?rev=835172&r1=835171&r2=835172&view=diff
==============================================================================
--- incubator/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java (original)
+++ incubator/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java Thu Nov 12 00:34:50 2009
@@ -71,9 +71,7 @@
         endpoint.setDestination(aMessage.getJMSReplyTo());
       }
       if (aMessage.propertyExists(UIMAMessage.ServerURI)) {
-        String selectedServerURI = chooseServerURI(aMessage
-                .getStringProperty(UIMAMessage.ServerURI));
-        endpoint.setServerURI(selectedServerURI);
+        endpoint.setServerURI(aMessage.getStringProperty(UIMAMessage.ServerURI));
         endpoint.setRemote(endpoint.getServerURI().startsWith("vm") == false);
       }
       // Check if the client attached a special property that needs to be echoed back.
@@ -92,30 +90,6 @@
     return endpointName;
   }
 
-  private String chooseServerURI(String aServerURIList) {
-    String serverURI = aServerURIList;
-
-    if (serverURI.indexOf(',') > 0) {
-      StringTokenizer st = new StringTokenizer(serverURI, ",");
-
-      while (st.hasMoreTokens()) {
-        String token = st.nextToken().trim();
-        if (token.startsWith("tcp")) {
-          // Normally this is the server URI for a java service.
-          serverURI = token;
-          break;
-        } else if (token.startsWith("http")) {
-          // http will only be in the list of uri's if the service is bahind the firewall.
-          // If present, this service needs to respond with http protocol as well.
-          serverURI = token;
-          break; // dont need to analyze this further. Will respond via http
-        }
-      }
-    }
-
-    return serverURI;
-  }
-
   public boolean propertyExists(String aKey) throws AsynchAEException {
     try {
       return message.propertyExists(aKey);