You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2014/03/12 14:15:02 UTC
svn commit: r1576728 [2/2] - in /lucene/dev/branches/branch_4x: ./
dev-tools/ dev-tools/eclipse/dot.settings/ dev-tools/idea/.idea/
dev-tools/idea/lucene/core/src/test/ dev-tools/maven/ dev-tools/scripts/
lucene/ lucene/core/ lucene/core/src/java/org/a...
Modified: lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java?rev=1576728&r1=1576727&r2=1576728&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java Wed Mar 12 13:15:00 2014
@@ -35,6 +35,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.CompletionService;
import java.util.concurrent.ExecutorCompletionService;
@@ -76,9 +77,12 @@ import org.apache.solr.common.cloud.Solr
import org.apache.solr.common.cloud.ZkCoreNodeProps;
import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.CollectionParams;
import org.apache.solr.common.params.CollectionParams.CollectionAction;
+import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.params.MapSolrParams;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.StrUtils;
@@ -1349,11 +1353,9 @@ public class CollectionsAPIDistributedZk
boolean changed = false;
while(System.currentTimeMillis() <tomeOut){
Thread.sleep(10);
- Object b = client.getZkStateReader().getClusterProps().get(name);
- changed = (val == b) || (val != null && val.equals(b));
+ changed = Objects.equals(val,client.getZkStateReader().getClusterProps().get(name));
if(changed) break;
}
return changed;
}
-
}
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/schema.xml?rev=1576728&r1=1576727&r2=1576728&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/schema.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/db/conf/schema.xml Wed Mar 12 13:15:00 2014
@@ -224,7 +224,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/schema.xml?rev=1576728&r1=1576727&r2=1576728&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/schema.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/mail/conf/schema.xml Wed Mar 12 13:15:00 2014
@@ -290,7 +290,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/schema.xml?rev=1576728&r1=1576727&r2=1576728&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/schema.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/rss/conf/schema.xml Wed Mar 12 13:15:00 2014
@@ -224,7 +224,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/schema.xml?rev=1576728&r1=1576727&r2=1576728&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/schema.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/example-DIH/solr/solr/conf/schema.xml Wed Mar 12 13:15:00 2014
@@ -224,7 +224,7 @@
See the Java Regular Expression documentation for more
infomation on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/schema.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/schema.xml?rev=1576728&r1=1576727&r2=1576728&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/schema.xml (original)
+++ lucene/dev/branches/branch_4x/solr/example/solr/collection1/conf/schema.xml Wed Mar 12 13:15:00 2014
@@ -622,7 +622,7 @@
See the Java Regular Expression documentation for more
information on pattern and replacement string syntax.
- http://java.sun.com/j2se/1.6.0/docs/api/java/util/regex/package-summary.html
+ http://docs.oracle.com/javase/7/docs/api/java/util/regex/package-summary.html
-->
<filter class="solr.PatternReplaceFilterFactory"
pattern="([^a-z])" replacement="" replace="all"
Modified: lucene/dev/branches/branch_4x/solr/site/html/tutorial.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/site/html/tutorial.html?rev=1576728&r1=1576727&r2=1576728&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/site/html/tutorial.html (original)
+++ lucene/dev/branches/branch_4x/solr/site/html/tutorial.html Wed Mar 12 13:15:00 2014
@@ -54,13 +54,13 @@ To follow along with this tutorial, you
</p>
<ol>
-<li>Java 1.6 or greater. Some places you can get it are from
+<li>Java 1.7 or greater. Some places you can get it are from
<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">Oracle</a>,
<a href="http://openjdk.java.net/">Open JDK</a>, or
<a href="http://www.ibm.com/developerworks/java/jdk/">IBM</a>.
<ul>
<li>Running <span class="codefrag">java -version</span> at the command
- line should indicate a version number starting with 1.6.
+ line should indicate a version number starting with 1.7.
</li>
<li>Gnu's GCJ is not supported and does not work with Solr.</li>
</ul>