svn commit: r1060642 - in /lucene/dev/branches/branch_3x/solr: ./ src/java/org/apache/solr/response/PHPSerializedResponseWriter.java src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java

[ho...@apache.org]

Author: hossman
Date: Wed Jan 19 00:58:17 2011
New Revision: 1060642

URL: http://svn.apache.org/viewvc?rev=1060642&view=rev
Log:
SOLR-2307: followup, merge 1060641 from trunk

Modified:
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
    lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java

Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java?rev=1060642&r1=1060641&r2=1060642&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java Wed Jan 19 00:58:17 2011
@@ -105,7 +105,8 @@ class PHPSerializedWriter extends JSONWr
   @Override
   public void writeDoc(String name, Collection<Fieldable> fields, Set<String> returnFields, Map pseudoFields) throws IOException {
     ArrayList<Fieldable> single = new ArrayList<Fieldable>();
-    HashMap<String, MultiValueField> multi = new HashMap<String, MultiValueField>();
+    LinkedHashMap<String, MultiValueField> multi 
+      = new LinkedHashMap<String, MultiValueField>();
 
     for (Fieldable ff : fields) {
       String fname = ff.name();
@@ -202,8 +203,8 @@ class PHPSerializedWriter extends JSONWr
   
   @Override
   public void writeSolrDocument(String name, SolrDocument doc, Set<String> returnFields, Map pseudoFields) throws IOException {
-    HashMap <String,Object> single = new HashMap<String, Object>();
-    HashMap <String,Object> multi = new HashMap<String, Object>();
+    LinkedHashMap <String,Object> single = new LinkedHashMap<String, Object>();
+    LinkedHashMap <String,Object> multi = new LinkedHashMap<String, Object>();
     int pseudoSize = pseudoFields != null ? pseudoFields.size() : 0;
 
     for (String fname : doc.getFieldNames()) {

Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java?rev=1060642&r1=1060641&r2=1060642&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java Wed Jan 19 00:58:17 2011
@@ -54,7 +54,8 @@ public class TestPHPSerializedResponseWr
     rsp.add("data2", 42);
     rsp.add("data3", true);
     w.write(buf, req, rsp);
-    assertEquals(buf.toString(), "a:3:{s:5:\"data1\";s:5:\"hello\";s:5:\"data2\";i:42;s:5:\"data3\";b:1;}");
+    assertEquals("a:3:{s:5:\"data1\";s:5:\"hello\";s:5:\"data2\";i:42;s:5:\"data3\";b:1;}", 
+                 buf.toString());
     req.close();
   }
 
@@ -94,7 +95,8 @@ public class TestPHPSerializedResponseWr
     rsp.add("response", sdl); 
     
     w.write(buf, req, rsp);
-    assertEquals(buf.toString(), "a:1:{s:8:\"response\";a:3:{s:8:\"numFound\";i:0;s:5:\"start\";i:0;s:4:\"docs\";a:2:{i:0;a:6:{s:2:\"id\";s:1:\"1\";s:5:\"data1\";s:5:\"hello\";s:5:\"data4\";a:2:{s:7:\"data4.2\";s:7:\"hashmap\";s:7:\"data4.1\";s:5:\"hello\";}s:5:\"data5\";a:3:{i:0;s:7:\"data5.1\";i:1;s:7:\"data5.2\";i:2;s:7:\"data5.3\";}s:5:\"data2\";i:42;s:5:\"data3\";b:1;}i:1;a:1:{s:2:\"id\";s:1:\"2\";}}}}");
+    assertEquals("a:1:{s:8:\"response\";a:3:{s:8:\"numFound\";i:0;s:5:\"start\";i:0;s:4:\"docs\";a:2:{i:0;a:6:{s:2:\"id\";s:1:\"1\";s:5:\"data1\";s:5:\"hello\";s:5:\"data2\";i:42;s:5:\"data3\";b:1;s:5:\"data4\";a:2:{s:7:\"data4.2\";s:7:\"hashmap\";s:7:\"data4.1\";s:5:\"hello\";}s:5:\"data5\";a:3:{i:0;s:7:\"data5.1\";i:1;s:7:\"data5.2\";i:2;s:7:\"data5.3\";}}i:1;a:1:{s:2:\"id\";s:1:\"2\";}}}}", 
+                 buf.toString());
     req.close();
   }