You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by eh...@apache.org on 2015/01/20 21:53:00 UTC
svn commit: r1653368 - in /lucene/dev/trunk: ./ solr/ solr/contrib/
solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
Author: ehatcher
Date: Tue Jan 20 20:52:59 2015
New Revision: 1653368
URL: http://svn.apache.org/r1653368
Log:
Fix wrong StringUtils import (merged from r1653365)
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/solr/ (props changed)
lucene/dev/trunk/solr/contrib/ (props changed)
lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
Modified: lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java?rev=1653368&r1=1653367&r2=1653368&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java (original)
+++ lucene/dev/trunk/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java Tue Jan 20 20:52:59 2015
@@ -29,7 +29,7 @@ import java.util.Locale;
import java.util.Properties;
import java.util.ResourceBundle;
-import org.apache.hadoop.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.solr.client.solrj.SolrResponse;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.client.solrj.response.SolrResponseBase;
@@ -282,7 +282,7 @@ public class VelocityResponseWriter impl
loaders.add("builtin");
engine.setProperty("builtin.resource.loader.instance", new ClasspathResourceLoader());
- engine.setProperty(RuntimeConstants.RESOURCE_LOADER, StringUtils.join(",", loaders));
+ engine.setProperty(RuntimeConstants.RESOURCE_LOADER, StringUtils.join(loaders,','));
// bring in any custom properties too
engine.init(velocityInitProps);