You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2015/01/07 18:42:23 UTC
svn commit: r1650126 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/core/InitParams.java
solr/core/src/test/org/apache/solr/core/TestInitParams.java
Author: noble
Date: Wed Jan 7 17:42:23 2015
New Revision: 1650126
URL: http://svn.apache.org/r1650126
Log:
SOLR-6365 path /update/** should match /update as well
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/InitParams.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestInitParams.java
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/InitParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/InitParams.java?rev=1650126&r1=1650125&r2=1650126&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/InitParams.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/InitParams.java Wed Jan 7 17:42:23 2015
@@ -65,7 +65,8 @@ public class InitParams {
private static boolean matchPath(String path, String name){
List<String> pathSplit = StrUtils.splitSmart(path, '/');
List<String> nameSplit = StrUtils.splitSmart(name, '/');
- for (int i = 0; i < nameSplit.size(); i++) {
+ int i = 0;
+ for (;i < nameSplit.size(); i++) {
String s = nameSplit.get(i);
String ps = pathSplit.size()>i ? pathSplit.get(i) :null;
if(ps == null) return false;
@@ -74,7 +75,8 @@ public class InitParams {
if("**".equals(ps)) return true;
return false;
}
- return true;
+ String ps = pathSplit.size()>i ? pathSplit.get(i) :null;
+ return "*".equals(ps) || "**".equals(ps);
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestInitParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestInitParams.java?rev=1650126&r1=1650125&r2=1650126&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestInitParams.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestInitParams.java Wed Jan 7 17:42:23 2015
@@ -108,10 +108,18 @@ public class TestInitParams extends Solr
}
- /* public void testMatchPath(){
+ public void testMatchPath(){
InitParams initParams = new InitParams(new PluginInfo(InitParams.TYPE, ZkNodeProps.makeMap("path","/update/json/docs")));
assertFalse(initParams.matchPath("/update"));
assertTrue(initParams.matchPath("/update/json/docs"));
- }*/
+ initParams = new InitParams(new PluginInfo(InitParams.TYPE, ZkNodeProps.makeMap("path","/update/**")));
+ assertTrue(initParams.matchPath("/update/json/docs"));
+ assertTrue(initParams.matchPath("/update/json"));
+ assertTrue(initParams.matchPath("/update"));
+ initParams = new InitParams(new PluginInfo(InitParams.TYPE, ZkNodeProps.makeMap("path","/update/*")));
+ assertFalse(initParams.matchPath("/update/json/docs"));
+ assertTrue(initParams.matchPath("/update/json"));
+ assertTrue(initParams.matchPath("/update"));
+ }
}