Author: bago
Date: Thu Aug 21 09:30:07 2008
New Revision: 687796
URL: http://svn.apache.org/viewvc?rev=687796&view=rev
Log:
Fallback to singletone lookup for Tester when javamail impl does not support
non-string session properies (JAMES-850 / Geronimo mail impl)
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=687796&r1=687795&r2=687796&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:30:07 2008
@@ -40,7 +40,10 @@
super(session, urlname);
owner = (Tester) session.getProperties().get("Tester");
connected = false;
- if (owner == null) throw new IllegalStateException("Can only be used
by a Tester:
"+session.getProperty("Tester")+"|"+session.getProperties().get("mail.smtp.class"));
+ 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"));
+ }
}
protected SMTPTransport(Session session, URLName urlname, String s, int i,
boolean flag) {
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=687796&r1=687795&r2=687796&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:30:07 2008
@@ -151,8 +151,10 @@
/**
* Javamail1.4 allows for providers to be specified
*/
-
props.put("mail.smtp.class", SMTPTransport.class.getName());
+
+ // 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);
Session s = Session.getInstance(props);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
