[AMQ-3635] JmsTopicConnector checks for presence of localClientId then uses outboundClientId

• Type: Bug
• Status: Resolved
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: 5.4.2
• Fix Version/s: 5.6.0
• Component/s: Connector

Environment

running 5.4.2 on linux.

• Assignee: Timothy A. Bish
• Reporter: Jeff Gillings
• Created: 13/Dec/11 20:31
• Updated: 31/Jan/12 21:56
• Resolved: 31/Jan/12 21:56

Description

On the JMS bridge topic connector, if I set the outboundClientId but not the localClientId, then the outbound client id will not be set.
This is because the JmsTopicConnector only sets the outboundClientId if the localClientId is set. This appears to be a bug.

Here is 5.4.2 JmsTopicConnector.initializeForeignTopicConnection

    protected void initializeForeignTopicConnection() throws NamingException, JMSException {
        if (outboundTopicConnection == null) {
            // get the connection factories
            if (outboundTopicConnectionFactory == null) {
                // look it up from JNDI
                if (outboundTopicConnectionFactoryName != null) {
                    outboundTopicConnectionFactory = (TopicConnectionFactory)jndiOutboundTemplate
                        .lookup(outboundTopicConnectionFactoryName, TopicConnectionFactory.class);
                    if (outboundUsername != null) {
                        outboundTopicConnection = outboundTopicConnectionFactory
                            .createTopicConnection(outboundUsername, outboundPassword);
                    } else {
                        outboundTopicConnection = outboundTopicConnectionFactory.createTopicConnection();
                    }
                } else {
                    throw new JMSException("Cannot create localConnection - no information");
                }
            } else {
                if (outboundUsername != null) {
                    outboundTopicConnection = outboundTopicConnectionFactory
                        .createTopicConnection(outboundUsername, outboundPassword);
                } else {
                    outboundTopicConnection = outboundTopicConnectionFactory.createTopicConnection();
                }
            }
        }
>>>>    if (localClientId != null && localClientId.length() > 0) {           // CHECKS for existence of localClientId
            outboundTopicConnection.setClientID(getOutboundClientId());      // THEN uses outboundClientId
        }
        outboundTopicConnection.start();
    }

I'm thinking the above code should check for existence of outboundClientId instead of localClientId

Compare this to:

    protected void initializeLocalTopicConnection() throws NamingException, JMSException {
        if (localTopicConnection == null) {
            // get the connection factories
            if (localTopicConnectionFactory == null) {
                if (embeddedConnectionFactory == null) {
                    // look it up from JNDI
                    if (localConnectionFactoryName != null) {
                        localTopicConnectionFactory = (TopicConnectionFactory)jndiLocalTemplate
                            .lookup(localConnectionFactoryName, TopicConnectionFactory.class);
                        if (localUsername != null) {
                            localTopicConnection = localTopicConnectionFactory
                                .createTopicConnection(localUsername, localPassword);
                        } else {
                            localTopicConnection = localTopicConnectionFactory.createTopicConnection();
                        }
                    } else {
                        throw new JMSException("Cannot create localConnection - no information");
                    }
                } else {
                    localTopicConnection = embeddedConnectionFactory.createTopicConnection();
                }
            } else {
                if (localUsername != null) {
                    localTopicConnection = localTopicConnectionFactory.createTopicConnection(localUsername,
                                                                                             localPassword);
                } else {
                    localTopicConnection = localTopicConnectionFactory.createTopicConnection();
                }
            }
        }
>>>>        if (localClientId != null && localClientId.length() > 0) {    // CHECKS for existence of localClientId
            localTopicConnection.setClientID(getLocalClientId());         // THEN uses localClientId
        }
        localTopicConnection.start();
    }