psmith 2004/06/27 16:54:41
Modified: src/java/org/apache/log4j/net JMSReceiver.java
Log:
Applied patch from Stephen Pain that ensures the isEquivalent method does not get
confused by
2 JMSReceivers with different jndi.properties.
Revision Changes Path
1.7 +5 -2 logging-log4j/src/java/org/apache/log4j/net/JMSReceiver.java
Index: JMSReceiver.java
===================================================================
RCS file: /home/cvs/logging-log4j/src/java/org/apache/log4j/net/JMSReceiver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JMSReceiver.java 9 Jun 2004 09:31:33 -0000 1.6
+++ JMSReceiver.java 27 Jun 2004 23:54:41 -0000 1.7
@@ -163,8 +163,11 @@
JMSReceiver receiver = (JMSReceiver)testPlugin;
// check for same topic name and super class equivalency
- return (topicFactoryName.equals(receiver.getTopicFactoryName()) &&
- super.isEquivalent(testPlugin));
+ return (
+ topicFactoryName.equals(receiver.getTopicFactoryName()) &&
+ (jndiPath == null || jndiPath.equals(receiver.getJndiPath())) &&
+ super.isEquivalent(testPlugin)
+ );
}
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
