You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/12/19 16:15:42 UTC

[1/2] lucene-solr:master: SOLR-9870: fix two typos in SolrCore.java (Mike Drob via Christine Poerschke)

Repository: lucene-solr
Updated Branches:
  refs/heads/master 2c4c5040e -> 07609443c


SOLR-9870: fix two typos in SolrCore.java (Mike Drob via Christine Poerschke)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/07609443
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/07609443
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/07609443

Branch: refs/heads/master
Commit: 07609443c5c7675c41e8e5ac3b62576f41ee4be8
Parents: b22451f
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Dec 19 16:05:06 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Dec 19 16:14:51 2016 +0000

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/core/SolrCore.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/07609443/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java
index b3facef..f75e780 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java
@@ -1701,7 +1701,7 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
    *
    * realtimeSearcher is updated to the latest opened searcher, regardless of the value of "realtime".
    *
-   * This method acquires openSearcherLock - do not call with searckLock held!
+   * This method acquires openSearcherLock - do not call with searchLock held!
    */
   public RefCounted<SolrIndexSearcher>  openNewSearcher(boolean updateHandlerReopens, boolean realtime) {
     if (isClosed()) { // catch some errors quicker
@@ -1982,7 +1982,7 @@ public final class SolrCore implements SolrInfoMBean, Closeable {
 
       Future future=null;
 
-      // if the underlying seracher has not changed, no warming is needed
+      // if the underlying searcher has not changed, no warming is needed
       if (newSearcher != currSearcher) {
 
         // warm the new searcher based on the current searcher.


[2/2] lucene-solr:master: LUCENE-7586: fail precommit on varargsArgumentNeedCast

Posted by cp...@apache.org.
LUCENE-7586: fail precommit on varargsArgumentNeedCast


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b22451f4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b22451f4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b22451f4

Branch: refs/heads/master
Commit: b22451f45ef791ef5985f95327e0b3c382e4c79a
Parents: 2c4c504
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Dec 19 12:51:10 2016 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Dec 19 16:14:51 2016 +0000

----------------------------------------------------------------------
 dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs | 1 +
 lucene/tools/javadoc/ecj.javadocs.prefs                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b22451f4/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
----------------------------------------------------------------------
diff --git a/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs b/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
index 0dea4ea..6f6533a 100644
--- a/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
+++ b/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
@@ -307,3 +307,4 @@ org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=error
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
 org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b22451f4/lucene/tools/javadoc/ecj.javadocs.prefs
----------------------------------------------------------------------
diff --git a/lucene/tools/javadoc/ecj.javadocs.prefs b/lucene/tools/javadoc/ecj.javadocs.prefs
index c81d8e3..61971ec 100644
--- a/lucene/tools/javadoc/ecj.javadocs.prefs
+++ b/lucene/tools/javadoc/ecj.javadocs.prefs
@@ -92,5 +92,5 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
 org.eclipse.jdt.core.compiler.source=1.8