Return-Path: Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: (qmail 66954 invoked from network); 10 Jan 2011 14:51:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Jan 2011 14:51:35 -0000 Received: (qmail 8148 invoked by uid 500); 10 Jan 2011 14:51:35 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 8136 invoked by uid 99); 10 Jan 2011 14:51:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jan 2011 14:51:34 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Jan 2011 14:51:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BD71723888D2; Mon, 10 Jan 2011 14:51:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1057221 - in /lucene/dev/trunk/solr/contrib/dataimporthandler: CHANGES.txt src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Date: Mon, 10 Jan 2011 14:51:13 -0000 To: commits@lucene.apache.org From: koji@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110110145113.BD71723888D2@eris.apache.org> Author: koji Date: Mon Jan 10 14:51:13 2011 New Revision: 1057221 URL: http://svn.apache.org/viewvc?rev=1057221&view=rev Log: SOLR-2310: getTimeElapsedSince() returns incorrect hour value when the elapse is over 60 hours Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/CHANGES.txt lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/CHANGES.txt?rev=1057221&r1=1057220&r2=1057221&view=diff ============================================================================== --- lucene/dev/trunk/solr/contrib/dataimporthandler/CHANGES.txt (original) +++ lucene/dev/trunk/solr/contrib/dataimporthandler/CHANGES.txt Mon Jan 10 14:51:13 2011 @@ -8,7 +8,7 @@ HTTP data sources quick and easy. $Id$ -================== 1.5.0-dev ================== +================== 4.0.0-dev ================== Upgrading from Solr 1.4 ---------------------- @@ -65,6 +65,9 @@ Bug Fixes * SOLR-1811: formatDate should use the current NOW value always (Sean Timm via noble) +* SOLR-2310: getTimeElapsedSince() returns incorrect hour value when the elapse is over 60 hours + (tom liu via koji) + Other Changes ---------------------- Modified: lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=1057221&r1=1057220&r2=1057221&view=diff ============================================================================== --- lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java (original) +++ lucene/dev/trunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Mon Jan 10 14:51:13 2011 @@ -949,7 +949,7 @@ public class DocBuilder { static String getTimeElapsedSince(long l) { l = System.currentTimeMillis() - l; - return (l / (60000 * 60)) % 60 + ":" + (l / 60000) % 60 + ":" + (l / 1000) + return (l / (60000 * 60)) + ":" + (l / 60000) % 60 + ":" + (l / 1000) % 60 + "." + l % 1000; }