You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2013/04/17 11:35:45 UTC
svn commit: r1468815 - in /qpid/trunk/qpid/java/broker/src:
main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
test/java/org/apache/qpid/server/filter/
test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
Author: kwall
Date: Wed Apr 17 09:35:45 2013
New Revision: 1468815
URL: http://svn.apache.org/r1468815
Log:
QPID-4731: Implemented JMSSelectorFilter equals() and hashcode() to avoid leaking topic queues. Previously TopicExchangeResult._filteredQueues look-ups in TopicExchangeResult.removeFilteredQueue were erroneously failing, causing the queues therein to evade deletion during topic consumer close.
Added:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/filter/
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java?rev=1468815&r1=1468814&r2=1468815&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/filter/JMSSelectorFilter.java Wed Apr 17 09:35:45 2013
@@ -14,14 +14,17 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
+ *
*
- *
*/
package org.apache.qpid.server.filter;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
import org.apache.log4j.Logger;
-
import org.apache.qpid.filter.BooleanExpression;
import org.apache.qpid.filter.FilterableMessage;
import org.apache.qpid.filter.SelectorParsingException;
@@ -119,6 +122,34 @@ public class JMSSelectorFilter implement
@Override
public String toString()
{
- return "JMSSelector("+_selector+")";
+ return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)
+ .append("selector", _selector)
+ .toString();
}
+
+ @Override
+ public int hashCode()
+ {
+ return new HashCodeBuilder().append(_selector).toHashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (obj == null)
+ {
+ return false;
+ }
+ if (obj == this)
+ {
+ return true;
+ }
+ if (obj.getClass() != getClass())
+ {
+ return false;
+ }
+ JMSSelectorFilter rhs = (JMSSelectorFilter) obj;
+ return new EqualsBuilder().append(_selector, rhs._selector).isEquals();
+ }
+
}
Added: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java?rev=1468815&view=auto
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java (added)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/filter/JMSSelectorFilterTest.java Wed Apr 17 09:35:45 2013
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.qpid.server.filter;
+
+import junit.framework.TestCase;
+
+public class JMSSelectorFilterTest extends TestCase
+{
+ public void testEqualsAndHashCodeUsingSelectorString() throws Exception
+ {
+ final String selectorString = "1 = 1";
+
+ JMSSelectorFilter filter1 = new JMSSelectorFilter(new String(selectorString));
+ JMSSelectorFilter filter2 = new JMSSelectorFilter(new String(selectorString));
+
+ assertEquals(filter1 + " should equal itself", filter1, filter1);
+ assertFalse(filter1 + " should not equal null", filter1.equals(null));
+ assertEqualsAndHashcodeMatch(filter1, filter2);
+
+ JMSSelectorFilter differentFilter = new JMSSelectorFilter("2 = 2");
+ assertNotEqual(filter1, differentFilter);
+ }
+
+ private void assertEqualsAndHashcodeMatch(JMSSelectorFilter filter1, JMSSelectorFilter filter2)
+ {
+ String message = filter1 + " and " + filter2 + " should be equal";
+
+ assertEquals(message, filter1, filter2);
+ assertEquals(message, filter2, filter1);
+
+ assertEquals("Hashcodes of " + filter1 + " and " + filter2 + " should be equal",
+ filter1.hashCode(), filter2.hashCode());
+ }
+
+ private void assertNotEqual(JMSSelectorFilter filter, JMSSelectorFilter differentFilter)
+ {
+ assertFalse(filter.equals(differentFilter));
+ assertFalse(differentFilter.equals(filter));
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org