You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2018/03/20 14:15:54 UTC

svn commit: r1827313 - in /uima/uima-as/branches/uima-as-3: uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java

Author: cwiklik
Date: Tue Mar 20 14:15:54 2018
New Revision: 1827313

URL: http://svn.apache.org/viewvc?rev=1827313&view=rev
Log:
UIMA-5747 made JMS clientID unique

Modified:
    uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java
    uima/uima-as/branches/uima-as-3/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java

Modified: uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java?rev=1827313&r1=1827312&r2=1827313&view=diff
==============================================================================
--- uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java (original)
+++ uima/uima-as/branches/uima-as-3/uimaj-as-core/src/main/java/org/apache/uima/aae/UIDGenerator.java Tue Mar 20 14:15:54 2018
@@ -19,11 +19,20 @@
 
 package org.apache.uima.aae;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.rmi.server.UID;
 
 public class UIDGenerator implements UniqueIdGenerator {
   public String nextId() {
     return new UID().toString();
   }
-
+  public static String getGUID() {
+		String localhost = "unknown_local_host";
+		try {
+			localhost = InetAddress.getLocalHost().getHostName();
+		} catch (UnknownHostException e) {
+		}
+		return localhost +"-" +new UID().toString();
+	}
 }

Modified: uima/uima-as/branches/uima-as-3/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/branches/uima-as-3/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java?rev=1827313&r1=1827312&r2=1827313&view=diff
==============================================================================
--- uima/uima-as/branches/uima-as-3/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java (original)
+++ uima/uima-as/branches/uima-as-3/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java Tue Mar 20 14:15:54 2018
@@ -4034,7 +4034,7 @@ public abstract class BaseUIMAAsynchrono
       //System.out.println("------------- BaseUIMAAsynchronousEngineCommon_impl.create() - Creating new Connection");
       //  Create shared jms connection to a broker
       connection = connectionFactory.createConnection();
-      connection.setClientID("ClientListener");
+      connection.setClientID("ClientListener-"+UIDGenerator.getGUID());
       state = ConnectionState.OPEN;
       stop = false;      
     }