You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jd...@apache.org on 2012/11/20 22:35:51 UTC
svn commit: r1411896 - in
/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src:
java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java
test/org/apache/solr/handler/dataimport/TestBuiltInEvaluators.java
Author: jdyer
Date: Tue Nov 20 21:35:50 2012
New Revision: 1411896
URL: http://svn.apache.org/viewvc?rev=1411896&view=rev
Log:
SOLR-4095: fix silly bug
Modified:
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java
lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestBuiltInEvaluators.java
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java?rev=1411896&r1=1411895&r2=1411896&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java Tue Nov 20 21:35:50 2012
@@ -93,7 +93,7 @@ public class DateFormatEvaluator extends
} else {
localeStr = localeObj.toString();
}
- availableLocales.get(localeStr);
+ locale = availableLocales.get(localeStr);
if(locale==null) {
throw new DataImportHandlerException(SEVERE, "Unsupported locale: " + localeStr);
}
Modified: lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestBuiltInEvaluators.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestBuiltInEvaluators.java?rev=1411896&r1=1411895&r2=1411896&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestBuiltInEvaluators.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestBuiltInEvaluators.java Tue Nov 20 21:35:50 2012
@@ -120,15 +120,16 @@ public class TestBuiltInEvaluators exten
Locale.ROOT);
calendar.add(Calendar.DAY_OF_YEAR, -2);
Date d = calendar.getTime();
-
- assertEquals(
- new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ROOT).format(d),
- dateFormatEval.evaluate("'NOW-2DAYS','yyyy-MM-dd HH:mm'", context));
- assertEquals(
- new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault())
- .format(d),
- dateFormatEval.evaluate("'NOW-2DAYS','yyyy-MM-dd HH:mm','"
- + currentLocale + "'", context));
+ {
+ String sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.ROOT).format(d);
+ String dfe = dateFormatEval.evaluate("'NOW-2DAYS','yyyy-MM-dd HH:mm'", context);
+ assertEquals(sdf,dfe);
+ }
+ {
+ String sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()).format(d);
+ String dfe = dateFormatEval.evaluate("'NOW-2DAYS','yyyy-MM-dd HH:mm','"+ currentLocale + "'", context);
+ assertEquals(sdf,dfe);
+ }
}
Date d = new Date();