Author: michiel
Date: 2009-06-03 09:22:06 +0200 (Wed, 03 Jun 2009)
New Revision: 35598
Modified:
mmbase/branches/MMBase-1_8/applications/email/src/org/mmbase/datatypes/VerifyEmailProcessor.java
Log:
didn't compile agains 1.8. So rolled back -r35466:35335
Modified:
mmbase/branches/MMBase-1_8/applications/email/src/org/mmbase/datatypes/VerifyEmailProcessor.java
===================================================================
---
mmbase/branches/MMBase-1_8/applications/email/src/org/mmbase/datatypes/VerifyEmailProcessor.java
2009-06-03 07:15:58 UTC (rev 35597)
+++
mmbase/branches/MMBase-1_8/applications/email/src/org/mmbase/datatypes/VerifyEmailProcessor.java
2009-06-03 07:22:06 UTC (rev 35598)
@@ -113,7 +113,7 @@
return new Object[][] {
{"body", "{2}"},
{"subject", "{0}"},
- {"from", "[email protected]"}
+ {"from", ""}
};
}
};
@@ -265,20 +265,13 @@
log.debug("Setting " + key + SEP + email + " in " + field);
- Cloud cloud = node.getCloud().getNonTransactionalCloud();
+ Cloud cloud = node.getCloud();
// Send an email.
Locale locale = cloud.getLocale();
ResourceBundle emailTemplate = getResourceBundle(locale);
- if (log.isDebugEnabled()) {
- log.debug("Found email template " + emailTemplate + " " +
emailTemplate.getLocale());
- for (String k : Collections.list(emailTemplate.getKeys()))
{
- log.debug(k + "=" + emailTemplate.getString(k));
- }
- }
-
Module emailModule =
cloud.getCloudContext().getModule("sendmail");
@@ -318,8 +311,7 @@
String from = emailTemplate.getString("from");
-
- if (! "".equals(from)) {
+ if ("".equals(from)) {
emailNode.setStringValue(fromField, from);
}
@@ -375,7 +367,6 @@
emailNode.delete();
}
- log.debug("Using cloud " + cloud);
emailNode = cloud.getNode(emailNode.getNumber());
try {
Function mailFunction = emailNode.getFunction("startmail");
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
