Author: ritchiem
Date: Thu Oct 11 04:46:10 2007
New Revision: 583781
URL: http://svn.apache.org/viewvc?rev=583781&view=rev
Log:
Merged revisions
573738-573739,573741-574077,574079-574236,574238-574265,574267-574503,574505-574554,574556-574584,574586-574873,574875-574901,574903-575737,575739-575787,575789-575810,575812-577772,577774-577940,577942-578057,578059-578732,578734,578736-578744,578746-578827,578829-578844,578846-579114,579116-579146,579148-579197,579199-579228,579230-579573,579575-579576,579579-579601,579603-579613,579615-579708,579710-580021,580023-580039,580042-580060,580062-580065,580067-580080,580082-580257,580259-580264,580266-580350,580352-580984,580986-580991,580994-581001,581003-581170,581172-581188,581190-581206,581208-581245,581247-581292,581294-581539,581541-581565,581567-581620,581622-581626,581628-581646,581648-581967,581969-582197,582199-582200,582203-582204,582206-582262,582264,582267-583084,583087,583089-583104,583106-583146,583148-583153,583155-583169,583171-583172,583174-583398,583400-583414,583416-583417,583419-583437,583439-583482,583484-583517,583519-583545,583547,583549-
583777 via svnmerge from
https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1
........
r583775 | ritchiem | 2007-10-11 12:24:36 +0100 (Thu, 11 Oct 2007) | 1 line
QPID-635 Added a unit test and implemented the equals() method on
BlockingMethodFrameListener and SpecificMethodFrameListener.
........
r583776 | ritchiem | 2007-10-11 12:28:36 +0100 (Thu, 11 Oct 2007) | 1 line
QPID-632 ImmediateMessageTest may not have sufficient time to see the
exception. Performing the close before checking for exceptions should give it
this time.
........
Added:
incubator/qpid/branches/M2/java/client/src/test/java/org/apache/qpid/client/SpecificMethodFrameListenerTest.java
- copied unchanged from r583776,
incubator/qpid/branches/M2.1/java/client/src/test/java/org/apache/qpid/client/SpecificMethodFrameListenerTest.java
Modified:
incubator/qpid/branches/M2/ (props changed)
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
Propchange: incubator/qpid/branches/M2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Oct 11 04:46:10 2007
@@ -1 +1 @@
-/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-583550
+/incubator/qpid/branches/M2.1:1-573736,573738-577772,577774-578732,578734,578736-578744,578746-578827,578829-583777
Modified:
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java?rev=583781&r1=583780&r2=583781&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
(original)
+++
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/protocol/BlockingMethodFrameListener.java
Thu Oct 11 04:46:10 2007
@@ -293,4 +293,19 @@
_lock.unlock();
}
}
+
+ public boolean equals(Object o)
+ {
+
+ if (o instanceof BlockingMethodFrameListener)
+ {
+ BlockingMethodFrameListener other = (BlockingMethodFrameListener)
o;
+
+ return _channelId == other._channelId;
+ }
+
+ return false;
+ }
+
+
}
Modified:
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java?rev=583781&r1=583780&r2=583781&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
(original)
+++
incubator/qpid/branches/M2/java/client/src/main/java/org/apache/qpid/client/state/listener/SpecificMethodFrameListener.java
Thu Oct 11 04:46:10 2007
@@ -36,6 +36,22 @@
public boolean processMethod(int channelId, AMQMethodBody frame) //throws
AMQException
{
+
+ //equiv to: (frame instanceof _expectedClass)
return _expectedClass.isInstance(frame);
}
+
+ public boolean equals(Object o)
+ {
+ if (o instanceof SpecificMethodFrameListener)
+ {
+ SpecificMethodFrameListener other = (SpecificMethodFrameListener)
o;
+
+ // here we need to check if the two classes are the same.
+ return (_channelId == other._channelId) &&
(_expectedClass.equals(other._expectedClass));
+ }
+
+ return false;
+ }
+
}
Modified:
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java?rev=583781&r1=583780&r2=583781&view=diff
==============================================================================
---
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
(original)
+++
incubator/qpid/branches/M2/java/systests/src/main/java/org/apache/qpid/test/framework/localcircuit/LocalCircuitImpl.java
Thu Oct 11 04:46:10 2007
@@ -406,11 +406,11 @@
// Request a status report.
check();
- // Apply all of the requested assertions, keeping record of any that
fail.
- List<Assertion> failures = applyAssertions(assertions);
-
// Clean up the publisher/receivers/controlSession/connections.
close();
+
+ // Apply all of the requested assertions, keeping record of any that
fail.
+ List<Assertion> failures = applyAssertions(assertions);
// Return any failed assertions to the caller.
return failures;
