You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2008/11/25 20:43:45 UTC
svn commit: r720572 - in /incubator/etch/trunk:
binding-csharp/runtime/src/main/csharp/Etch/Transport/PlainMailbox.cs
binding-java/runtime/src/main/java/etch/bindings/java/transport/PlainMailbox.java
Author: sccomer
Date: Tue Nov 25 11:43:44 2008
New Revision: 720572
URL: http://svn.apache.org/viewvc?rev=720572&view=rev
Log:
fix for ETCH-8: canceling mailbox notification registration throws exception if not registered.
Modified:
incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Etch/Transport/PlainMailbox.cs
incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/PlainMailbox.java
Modified: incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Etch/Transport/PlainMailbox.cs
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Etch/Transport/PlainMailbox.cs?rev=720572&r1=720571&r2=720572&view=diff
==============================================================================
--- incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Etch/Transport/PlainMailbox.cs (original)
+++ incubator/etch/trunk/binding-csharp/runtime/src/main/csharp/Etch/Transport/PlainMailbox.cs Tue Nov 25 11:43:44 2008
@@ -232,12 +232,15 @@
public void UnregisterNotify(Notify notify)
{
if (notify == null)
- throw new NullReferenceException("notify == null");
+ throw new ArgumentNullException("notify == null");
lock (queue)
{
if (notify != this.notify)
- throw new NullReferenceException("notify != this.notify");
+ throw new ArgumentException("notify != this.notify");
+
+ if (this.notify == null)
+ return;
if (alarmSet)
{
Modified: incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/PlainMailbox.java
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/PlainMailbox.java?rev=720572&r1=720571&r2=720572&view=diff
==============================================================================
--- incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/PlainMailbox.java (original)
+++ incubator/etch/trunk/binding-java/runtime/src/main/java/etch/bindings/java/transport/PlainMailbox.java Tue Nov 25 11:43:44 2008
@@ -182,6 +182,9 @@
if (oldNotify == null)
throw new NullPointerException( "notify == null" );
+ if (this.notify == null)
+ return;
+
synchronized (queue)
{
if (oldNotify != this.notify)