Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
In directory james.mmbase.org:/tmp/cvs-serv30872
Modified Files:
Tag: b1_5
NewsletterGenerator.java
Log Message:
CMSC-1084, Newsletter: sending test email contains empty body,add error
messages to print out the system live-path use http
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher
See also: http://www.mmbase.org/jira/browse/CMSC-1084
Index: NewsletterGenerator.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/publisher/NewsletterGenerator.java,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -b -r1.11.2.2 -r1.11.2.3
--- NewsletterGenerator.java 23 Oct 2008 08:54:15 -0000 1.11.2.2
+++ NewsletterGenerator.java 24 Oct 2008 02:36:31 -0000 1.11.2.3
@@ -32,8 +32,8 @@
log.debug("Try to get content from URL:" + urlPath);
URL url = new URL(urlPath);
- if (!Pattern.matches("http://(\\w+(-\\w+)*)(\\.(\\w+(-\\w+)*))*(\\
?\\S*)?$", urlPath)) {
- errorInfo += "the path does not start with http:// ";
+ if (urlPath.indexOf("http") < 0) {
+ errorInfo += "the path does not start with http: ";
}
HttpURLConnection connection = (HttpURLConnection)
url.openConnection();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
