Author: simoneg
Date: Tue Feb 2 17:26:39 2010
New Revision: 905716
URL: http://svn.apache.org/viewvc?rev=905716&view=rev
Log:
Avoid NPE in sending mail from HTML producers created outside of a web method
Modified:
labs/magma/trunk/website-email/src/main/java/org/apache/magma/email/AddWebBasedEmailMethods.aj
Modified:
labs/magma/trunk/website-email/src/main/java/org/apache/magma/email/AddWebBasedEmailMethods.aj
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/website-email/src/main/java/org/apache/magma/email/AddWebBasedEmailMethods.aj?rev=905716&r1=905715&r2=905716&view=diff
==============================================================================
---
labs/magma/trunk/website-email/src/main/java/org/apache/magma/email/AddWebBasedEmailMethods.aj
(original)
+++
labs/magma/trunk/website-email/src/main/java/org/apache/magma/email/AddWebBasedEmailMethods.aj
Tue Feb 2 17:26:39 2010
@@ -39,7 +39,12 @@
ByteArrayOutputStream baos = new ByteArrayOutputStream();
URLRewritingStream original = Cycle.get().getRewriting();
URLRewritingStream str = new URLRewritingStream(baos,
original.absoluteUrl("magma:/"), "");
- str.setBaseUrl(producer.getBasePath());
+ try {
+ str.setBaseUrl(producer.getBasePath());
+ } catch (Exception e) {
+ // A NPE can happen if the producer is created outside
a web method,
+ // for example in a job
+ }
OutputStreamWriter osw = new OutputStreamWriter(str);
try {
osw.append("<html><head>");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
