Return-Path: 
 <continuum-commits-return-1323-apmail-maven-continuum-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-continuum-commits-archive@www.apache.org
Received: (qmail 2217 invoked from network); 2 Dec 2005 14:25:57 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 2 Dec 2005 14:25:57 -0000
Received: (qmail 16333 invoked by uid 500); 2 Dec 2005 14:25:57 -0000
Delivered-To: apmail-maven-continuum-commits-archive@maven.apache.org
Received: (qmail 16305 invoked by uid 500); 2 Dec 2005 14:25:56 -0000
Mailing-List: contact continuum-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:continuum-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:continuum-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:continuum-commits@maven.apache.org>
List-Id: <continuum-commits.maven.apache.org>
Reply-To: continuum-dev@maven.apache.org
Delivered-To: mailing list continuum-commits@maven.apache.org
Received: (qmail 16291 invoked by uid 99); 2 Dec 2005 14:25:56 -0000
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Fri, 02 Dec 2005 06:25:54 -0800
Received: (qmail 2055 invoked by uid 65534); 2 Dec 2005 14:25:30 -0000
Message-ID: <20051202142530.2054.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r351733 - in
 /maven/continuum/trunk/continuum-web/src/main:
 java/org/apache/maven/continuum/web/tool/DateTool.java
 resources/templates/screens/ProjectBuilds.vm
Date: Fri, 02 Dec 2005 14:25:29 -0000
To: continuum-commits@maven.apache.org
From: evenisse@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: evenisse
Date: Fri Dec  2 06:25:22 2005
New Revision: 351733

URL: http://svn.apache.org/viewcvs?rev=351733&view=rev
Log:
PR: CONTINUUM-496

Fix dates when they are null.

Modified:
    maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java
    maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm

Modified: maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java?rev=351733&r1=351732&r2=351733&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java (original)
+++ maven/continuum/trunk/continuum-web/src/main/java/org/apache/maven/continuum/web/tool/DateTool.java Fri Dec  2 06:25:22 2005
@@ -461,6 +461,10 @@
     public String format(String format, Object obj, 
                          Locale locale, TimeZone timezone)
     {
+        if ( obj == null )
+        {
+            return null;
+        }
         Date date = toDate(obj);
         DateFormat df = getDateFormat(format, locale, timezone);
         if (date == null || df == null)

Modified: maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm
URL: http://svn.apache.org/viewcvs/maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm?rev=351733&r1=351732&r2=351733&view=diff
==============================================================================
--- maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm (original)
+++ maven/continuum/trunk/continuum-web/src/main/resources/templates/screens/ProjectBuilds.vm Fri Dec  2 06:25:22 2005
@@ -33,8 +33,8 @@
       #foreach ( $build in $builds )
       <tr class="$css.nextClass">
         <td>#if ( $build.state == 2 ) $build.buildNumber #end</td>
-        <td>$date.format('medium',$build.startTime)</td>
-        <td>$date.format('medium',$build.endTime)</td>
+        <td>$!{date.format('medium',$build.startTime)}</td>
+        <td>$!{date.format('medium',$build.endTime)}</td>
         <td>$state.generate($build)</td>
         <td><a href="$link.setPage('ProjectBuild.vm').addQueryData('view','ProjectBuild').addQueryData('buildId',$build.id).addQueryData('id',$project.id)">Result</a></td>
       </tr>