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 2014/07/16 22:58:14 UTC
svn commit: r1611187 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/DuccTransportConfiguration.java
Author: cwiklik
Date: Wed Jul 16 20:58:13 2014
New Revision: 1611187
URL: http://svn.apache.org/r1611187
Log:
UIMA-3948 reverted changes made under UIMA-3942. The changes did not fix the problem with http connectivity
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/DuccTransportConfiguration.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/DuccTransportConfiguration.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/DuccTransportConfiguration.java?rev=1611187&r1=1611186&r2=1611187&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/DuccTransportConfiguration.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/DuccTransportConfiguration.java Wed Jul 16 20:58:13 2014
@@ -43,28 +43,16 @@ public class DuccTransportConfiguration
BrokerCredentials.Credentials credentials = null;
synchronized(ActiveMQComponent.class) {
if ( duccAMQComponent == null ) {
-// duccAMQComponent = ActiveMQComponent.activeMQComponent(brokerUrl);
duccAMQComponent = new ActiveMQComponent(context);
-
- String connectURL = "";
- // if provided broker url is tcp based, enforce the failover to enable recovery after
- // switch/network failures
- if ( brokerUrl.trim().startsWith("tcp://")) {
- // Split decoration from the broker uri. The code below enforces failover which
- // has syntax: failover(<broker uri>)?<decoration>
- int pos = brokerUrl.indexOf("?");
- String decoration = "";
- if (pos > -1) {
- decoration = brokerUrl.substring(pos);
- }
-
- brokerUrl = brokerUrl.substring(0, pos);
- connectURL = "failover:(" + brokerUrl + ")" + decoration;
- } else {
- connectURL = brokerUrl;
+ int pos = brokerUrl.indexOf("?");
+ String decoration = "";
+ if (pos > -1) {
+ decoration = brokerUrl.substring(pos);
}
- duccAMQComponent.setBrokerURL(connectURL);
+ brokerUrl = brokerUrl.substring(0, pos);
+ String connectURL = "failover:(" + brokerUrl + ")" + decoration;
+ duccAMQComponent.setBrokerURL(connectURL);
logger.info("configureJMSTransport", null, "Broker URL: "+connectURL);
logger.info("configureJMSTransport", null, "brokerCredentialsFile:"+brokerCredentialsFile);