You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ry...@apache.org on 2008/11/07 00:54:21 UTC

svn commit: r712017 - in /lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request: PageTool.java SolrParamResourceLoader.java

Author: ryan
Date: Thu Nov  6 15:54:20 2008
New Revision: 712017

URL: http://svn.apache.org/viewvc?rev=712017&view=rev
Log:
replacing deprecated StringBufferInputStream with ByteArrayInputStream -- removing unused imports

Modified:
    lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java
    lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrParamResourceLoader.java

Modified: lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java?rev=712017&r1=712016&r2=712017&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java (original)
+++ lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/PageTool.java Thu Nov  6 15:54:20 2008
@@ -17,7 +17,6 @@
 
 package org.apache.solr.request;
 
-import org.apache.solr.common.util.NamedList;
 import org.apache.solr.search.DocSlice;
 
 public class PageTool {

Modified: lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrParamResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrParamResourceLoader.java?rev=712017&r1=712016&r2=712017&view=diff
==============================================================================
--- lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrParamResourceLoader.java (original)
+++ lucene/solr/trunk/contrib/velocity/src/main/java/org/apache/solr/request/SolrParamResourceLoader.java Thu Nov  6 15:54:20 2008
@@ -22,13 +22,14 @@
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.commons.collections.ExtendedProperties;
 
+import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.io.StringBufferInputStream;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.Map;
 
 public class SolrParamResourceLoader extends ResourceLoader {
-  private HashMap<String,String> templates = new HashMap();
+  private Map<String,String> templates = new HashMap<String,String>();
   public SolrParamResourceLoader(SolrQueryRequest request) {
     super();
 
@@ -52,7 +53,7 @@
 
   public InputStream getResourceStream(String s) throws ResourceNotFoundException {
     String template = templates.get(s);
-    return template == null ? null : new StringBufferInputStream(template);
+    return template == null ? null : new ByteArrayInputStream( s.getBytes() );
   }
 
   public boolean isSourceModified(Resource resource) {