[jboss-svn-commits] JBL Code SVN: r19933 - labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2008-05-12 11:35:54 -0400 (Mon, 12 May 2008)
New Revision: 19933

Modified:
   labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java
Log:
svn merge -r 19922:19932 https://svn.labs.jboss.org/labs/jbosslabs/trunk/portal-extensions .

Modified: labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java	2008-05-12 15:32:39 UTC (rev 19932)
+++ labs/jbosslabs/qa/portal-extensions/jbosswiki/wiki-common/src/java/com/ecyrd/jspwiki/plugin/CurrentTimePlugin.java	2008-05-12 15:35:54 UTC (rev 19933)
@@ -13,15 +13,19 @@
 	@Override
 	public String process(WikiPage wikiPage, WikiSession wikiSession,
 			HashMap<String, String> attributes) {
-		
+
 		String format = attributes.get("format");
-		
-		if (format == null) 
+
+		if (format == null)
 			format = "";
-		
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
 
-		return simpleDateFormat.format(new Date());
+		try {
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
+			return simpleDateFormat.format(new Date());
+		} catch (IllegalArgumentException e) {
+			return "PLUGIN ERROR: DATE FORMAT INVALID";
+		}
+
 	}
 
 	@Override