svn commit: r687799 - in /james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester: SMTPTransport.java Tester.java

[bago]

Author: bago
Date: Thu Aug 21 09:39:54 2008
New Revision: 687799

URL: http://svn.apache.org/viewvc?rev=687799&view=rev
Log:
Avoid using an Object as a session property. Set only the identifier and simply 
check that the singleton is for the same tester for safety. (JAMES-850)

Modified:
    
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/SMTPTransport.java
    
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java

Modified: 
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/SMTPTransport.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/SMTPTransport.java?rev=687799&r1=687798&r2=687799&view=diff
==============================================================================
--- 
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/SMTPTransport.java
 (original)
+++ 
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/SMTPTransport.java
 Thu Aug 21 09:39:54 2008
@@ -38,11 +38,11 @@
     
     public SMTPTransport(Session session, URLName urlname) {
         super(session, urlname);
-        owner = (Tester) session.getProperties().get("Tester");
+        String ownerId = session.getProperty("TesterID");
         connected = false;
-        if (owner == null) {
-            owner = Tester.getInstance();
-            // throw new IllegalStateException("Can only be used by a Tester: 
"+session.getProperty("Tester")+"|"+session.getProperties().get("mail.smtp.class"));
+        owner = Tester.getInstance();
+        if (!("Tester@"+System.identityHashCode(owner)).equals(ownerId)) {
+            throw new IllegalStateException("The singleton tester is not the 
one declared in the session");
         }
     }
     

Modified: 
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java?rev=687799&r1=687798&r2=687799&view=diff
==============================================================================
--- 
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java
 (original)
+++ 
james/server/trunk/mailets-function/src/test/java/org/apache/james/transport/remotedeliverytester/Tester.java
 Thu Aug 21 09:39:54 2008
@@ -155,14 +155,9 @@
         
         // WARN "this" is not a String and some JavaMail implementation could 
ignore it.
         // We fall back to Tester.getInstance when this property is not 
returned (geronimo doesn't return it).
-        props.put("Tester", this);
+        props.put("TesterID", "Tester@"+System.identityHashCode(this));
         Session s = Session.getInstance(props);
 
-        // debug
-        System.out.println("RemoteDelivery Tester DEBUG: 
"+s.getProperty("mail.smtp.class"));
-        System.out.println("RemoteDelivery Tester DEBUG: 
"+s.getProperty("Tester"));
-        System.out.println("RemoteDelivery Tester DEBUG: 
"+s.getProperties().get("Tester"));
-        
         // Session s = Session.getDefaultInstance(props);
         try {
             if (!((s.getTransport("smtp")) instanceof SMTPTransport))



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