Here is my proposed patch against current 2.3 branch:
-----------------------
Index: james-2.3/src/java/org/apache/james/James.java
===================================================================
--- james-2.3/src/java/org/apache/james/James.java      (revision 434375)
+++ james-2.3/src/java/org/apache/james/James.java      (working copy)
@@ -755,7 +755,7 @@
      * @return the minor vesion number for the server
      */
     public int getMinorVersion() {
-        return 1;
+        return 3;
     }

     /**
Index: james-2.3/src/java/org/apache/james/core/MailImpl.java
===================================================================
--- james-2.3/src/java/org/apache/james/core/MailImpl.java      (revision 
434375)
+++ james-2.3/src/java/org/apache/james/core/MailImpl.java      (working copy)
@@ -387,7 +387,7 @@
         // If a setMessage is called on a Mail that already have a message
         // (discouraged) we have to make sure that the message we remove is
         // correctly unreferenced and disposed, otherwise it will keep
locks
-        if (this.message != null) {
+        if (this.message != null && this.message != message) {
             ContainerUtil.dispose(this.message);
         }
         this.message = message;
--------------------------

After we'll have applied this one I'll be +1 for 2.3.0rc3.

Stefano

Stefano Bagnara wrote:
> Noel J. Bergman wrote:
>> +1 to post JAMES 2.3.0 Release Candiate 3
>>
>>      --- Noel
> 
> 
> I want like to fix open bugs before the rc3:
> 
> JAMES-613 - Define a new version for Mailet API and update James.java to
> return the new version.
> https://issues.apache.org/jira/browse/JAMES-613
> 
> I would use 2 for major and 3 for minor even for the mailet apis. I
> don't know why we skipped 2.2 for mailet apis, but I really think we
> should use 2.3 now.
> 
> 
> JAMES-609 - MailImpl.setMessage and possible NPE: regression from 2.2.0
> and 2.3.0rc1
> https://issues.apache.org/jira/browse/JAMES-609
> 
> I would at least apply the identity check in the MailImpl.setMessage to
> avoid disposing the message just being setted.
> 
> 
> I'm -0 on 2.3.0rc3 without this 2 fixes. We can fix both in 1 minute,
> but we need agreement on the solution.
> 
> Stefano
> 




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to