Changeset 216

Show
Ignore:
Timestamp:
07/12/08 00:01:29 (6 months ago)
Author:
jfp
Message:

revert uuid gen + fix session reset after data

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/jsmtpd-2.x/jsmtpd-core/pom.xml

    r214 r216  
    119119                </dependency> 
    120120                <dependency> 
    121                     <groupId>jug</groupId> 
    122                     <artifactId>jug</artifactId> 
    123                     <version>1.1</version> 
    124                 </dependency>  
    125                 <dependency> 
    126121                        <groupId>commons-logging</groupId> 
    127122                        <artifactId>commons-logging</artifactId> 

  • trunk/jsmtpd-2.x/jsmtpd-core/src/main/java/org/jsmtpd/domain/Email.java

    r215 r216  
    2929import java.util.List; 
    3030import java.util.Map; 
     31import java.util.UUID; 
    3132 
    32 import org.doomdark.uuid.UUIDGenerator; 
     33import org.jsmtpd.utils.DateUtil; 
    3334import org.jsmtpd.utils.BufferStream; 
    34 import org.jsmtpd.utils.DateUtil; 
    3535 
    3636public class Email implements Serializable { 
    …… 
    5454     
    5555        public Email genId() { 
    56                 id=UUIDGenerator.getInstance().generateRandomBasedUUID().toString(); 
     56                id=UUID.randomUUID().toString(); 
    5757                return this; 
    5858        } 

  • trunk/jsmtpd-2.x/jsmtpd-core/src/main/java/org/jsmtpd/smtp/server/commands/EndDataCommand.java

    r211 r216  
    2222import org.apache.commons.logging.LogFactory; 
    2323import org.jsmtpd.domain.DeliveryEmail; 
     24import org.jsmtpd.domain.Email; 
    2425import org.jsmtpd.queue.MailQueue; 
    2526import org.jsmtpd.smtp.server.SmtpServerSession; 
    …… 
    4546                log.debug("Message queued"); 
    4647                session.getChannelDriver().sendMessage(MSG_QUEUED+"as "+id); 
    47                 return true; 
    48                  
     48                session.setEmail(new Email().genId()); 
     49                return true;            
    4950        } 
    5051