lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rm...@apache.org
Subject svn commit: r925637 - in /lucene/solr/branches/newtrunk/solr: ./ contrib/dataimporthandler/ contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/ lib/ src/common/org/apache/solr/common/ src/java/org/apache/solr/response/ src/maven...
Date Sat, 20 Mar 2010 17:18:22 GMT
Author: rmuir
Date: Sat Mar 20 17:18:22 2010
New Revision: 925637

URL: http://svn.apache.org/viewvc?rev=925637&view=rev
Log:
merge up to solr trunk rev 925091

Modified:
    lucene/solr/branches/newtrunk/solr/   (props changed)
    lucene/solr/branches/newtrunk/solr/CHANGES.txt
    lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/CHANGES.txt
    lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java
    lucene/solr/branches/newtrunk/solr/lib/commons-httpclient-3.1.jar   (props changed)
    lucene/solr/branches/newtrunk/solr/lib/jcl-over-slf4j-1.5.5.jar   (props changed)
    lucene/solr/branches/newtrunk/solr/src/common/org/apache/solr/common/   (props changed)
    lucene/solr/branches/newtrunk/solr/src/java/org/apache/solr/response/XMLWriter.java
    lucene/solr/branches/newtrunk/solr/src/maven/solr-core-pom.xml.template   (props changed)
    lucene/solr/branches/newtrunk/solr/src/maven/solr-solrj-pom.xml.template   (props changed)
    lucene/solr/branches/newtrunk/solr/src/solrj/org/   (props changed)
    lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/   (props changed)
    lucene/solr/branches/newtrunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
  (props changed)

Propchange: lucene/solr/branches/newtrunk/solr/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 20 17:18:22 2010
@@ -2,4 +2,4 @@
 /lucene/java/branches/lucene_2_9/solr:817269-818600,825998,829134,829881,831036,896850,909334
 /lucene/java/branches/lucene_2_9_back_compat_tests/solr:818601-821336
 /lucene/java/branches/lucene_3_0/solr:880793,896906
-/lucene/solr/trunk:922950-923910,923912-924414
+/lucene/solr/trunk:922950-923910,923912-925091

Modified: lucene/solr/branches/newtrunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/CHANGES.txt?rev=925637&r1=925636&r2=925637&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/CHANGES.txt (original)
+++ lucene/solr/branches/newtrunk/solr/CHANGES.txt Sat Mar 20 17:18:22 2010
@@ -219,6 +219,9 @@ Bug Fixes
 * SOLR-1798: Small memory leak (~100 bytes) in fastLRUCache for every
   commit. (yonik)
 
+* SOLR-1823: Fixed XMLResponseWriter (via XMLWriter) so it no longer throws
+  a ClassCastException when a Map containing a non-String key is used.
+  (Frank Wesemann, hossman)
 
 Other Changes
 ----------------------

Modified: lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/CHANGES.txt?rev=925637&r1=925636&r2=925637&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/CHANGES.txt (original)
+++ lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/CHANGES.txt Sat Mar 20 17:18:22
2010
@@ -61,7 +61,9 @@ Bug Fixes
 
 * SOLR-1766: DIH with threads enabled doesn't respond to the abort command (Michael Henson
via noble)
 
-* SOLR-1767: dataimporter.functions.escapeSql() does not escape backslash character (Sean
Timm via noble) 
+* SOLR-1767: dataimporter.functions.escapeSql() does not escape backslash character (Sean
Timm via noble)
+
+* SOLR-1811: formatDate should use the current NOW value always (Sean Timm via noble)
 
 Other Changes
 ----------------------

Modified: lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java?rev=925637&r1=925636&r2=925637&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java
(original)
+++ lucene/solr/branches/newtrunk/solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/EvaluatorBag.java
Sat Mar 20 17:18:22 2010
@@ -298,6 +298,11 @@ public class EvaluatorBag {
   static Pattern IN_SINGLE_QUOTES = Pattern.compile("^'(.*?)'$");
 
   static DateMathParser dateMathParser = new DateMathParser(TimeZone
-          .getDefault(), Locale.getDefault());
+          .getDefault(), Locale.getDefault()){
+    @Override
+    public Date getNow() {
+      return new Date();
+    }
+  };
 
 }

Propchange: lucene/solr/branches/newtrunk/solr/lib/commons-httpclient-3.1.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 20 17:18:22 2010
@@ -1 +1 @@
-/lucene/solr/trunk/lib/commons-httpclient-3.1.jar:922950-923910,923912-924414
+/lucene/solr/trunk/lib/commons-httpclient-3.1.jar:922950-923910,923912-925091

Propchange: lucene/solr/branches/newtrunk/solr/lib/jcl-over-slf4j-1.5.5.jar
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 20 17:18:22 2010
@@ -1 +1 @@
-/lucene/solr/trunk/lib/jcl-over-slf4j-1.5.5.jar:922950-923910,923912-924414
+/lucene/solr/trunk/lib/jcl-over-slf4j-1.5.5.jar:922950-923910,923912-925091

Propchange: lucene/solr/branches/newtrunk/solr/src/common/org/apache/solr/common/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 20 17:18:22 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/common/org/apache/solr/common:922950-923910,923912-924414
+/lucene/solr/trunk/src/common/org/apache/solr/common:922950-923910,923912-925091

Modified: lucene/solr/branches/newtrunk/solr/src/java/org/apache/solr/response/XMLWriter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/newtrunk/solr/src/java/org/apache/solr/response/XMLWriter.java?rev=925637&r1=925636&r2=925637&view=diff
==============================================================================
--- lucene/solr/branches/newtrunk/solr/src/java/org/apache/solr/response/XMLWriter.java (original)
+++ lucene/solr/branches/newtrunk/solr/src/java/org/apache/solr/response/XMLWriter.java Sat
Mar 20 17:18:22 2010
@@ -631,20 +631,25 @@ final public class XMLWriter {
     }
   }
 
-
-
-  //A map is currently represented as a named list
-  public void writeMap(String name, Map val) throws IOException {
-    Map map = val;
+  
+  /**
+   * writes a Map in the same format as a NamedList, using the
+   * stringification of the key Object when it's non-null.
+   *
+   * @param name
+   * @param map
+   * @throws IOException
+   * @see http://lucene.apache.org/solr/api/org/apache/solr/response/SolrQueryResponse.html#returnable_data
+   */
+  public void writeMap(String name, Map<Object,Object> map) throws IOException {
     int sz = map.size();
     startTag("lst", name, sz<=0);
     incLevel();
-    for (Map.Entry entry : (Set<Map.Entry>)map.entrySet()) {
-      // possible class-cast exception here...
-      String k = (String)entry.getKey();
+    for (Map.Entry<Object,Object> entry : map.entrySet()) {
+      Object k = entry.getKey();
       Object v = entry.getValue();
       // if (sz<indentThreshold) indent();
-      writeVal(k,v);
+      writeVal( null == k ? null : k.toString(), v);
     }
     decLevel();
     if (sz > 0) {

Propchange: lucene/solr/branches/newtrunk/solr/src/maven/solr-core-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 20 17:18:22 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/maven/solr-core-pom.xml.template:922950-923910,923912-924414
+/lucene/solr/trunk/src/maven/solr-core-pom.xml.template:922950-923910,923912-925091

Propchange: lucene/solr/branches/newtrunk/solr/src/maven/solr-solrj-pom.xml.template
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 20 17:18:22 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/maven/solr-solrj-pom.xml.template:922950-923910,923912-924414
+/lucene/solr/trunk/src/maven/solr-solrj-pom.xml.template:922950-923910,923912-925091

Propchange: lucene/solr/branches/newtrunk/solr/src/solrj/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 20 17:18:22 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/solrj/org:922950-923910,923912-924414
+/lucene/solr/trunk/src/solrj/org:922950-923910,923912-925091

Propchange: lucene/solr/branches/newtrunk/solr/src/test/org/apache/solr/client/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 20 17:18:22 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/test/org/apache/solr/client:922950-923910,923912-924414
+/lucene/solr/trunk/src/test/org/apache/solr/client:922950-923910,923912-925091

Propchange: lucene/solr/branches/newtrunk/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 20 17:18:22 2010
@@ -1 +1 @@
-/lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-924414
+/lucene/solr/trunk/src/webapp/src/org/apache/solr/client/solrj/embedded:922950-923910,923912-925091



Mime
View raw message