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 2017/05/26 06:09:33 UTC
[1/2] lucene-solr:feature/autoscaling: NPE fix
Repository: lucene-solr
Updated Branches:
refs/heads/feature/autoscaling ded343284 -> 9cd245eac
NPE fix
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b4ec4649
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b4ec4649
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b4ec4649
Branch: refs/heads/feature/autoscaling
Commit: b4ec4649a64ee516740fcbe47bbf5dbdfc0e0d7c
Parents: c3aa3f9
Author: Noble Paul <no...@apache.org>
Authored: Fri May 26 15:31:54 2017 +0930
Committer: Noble Paul <no...@apache.org>
Committed: Fri May 26 15:31:54 2017 +0930
----------------------------------------------------------------------
solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b4ec4649/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java b/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java
index f3eda6c..fc1a707 100644
--- a/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java
+++ b/solr/solrj/src/java/org/apache/solr/cloud/autoscaling/Clause.java
@@ -303,7 +303,7 @@ public class Clause implements MapWriter, Comparable<Clause> {
Object tagVal = row.getVal(tag.name);
tagVsCount.putIfAbsent(tag.isPass(tagVal) ? String.valueOf(tagVal) : "", new AtomicInteger());
if (tag.isPass(tagVal)) {
- tagVsCount.get(tagVal).addAndGet(shards.getValue().size());
+ tagVsCount.get(String.valueOf(tagVal)).addAndGet(shards.getValue().size());
}
}
}
[2/2] lucene-solr:feature/autoscaling: Merge remote-tracking branch
'origin/feature/autoscaling' into feature/autoscaling
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/feature/autoscaling' into feature/autoscaling
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9cd245ea
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9cd245ea
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9cd245ea
Branch: refs/heads/feature/autoscaling
Commit: 9cd245eaccdaa62e6cd52c302cdfe262b0161bc5
Parents: b4ec464 ded3432
Author: Noble Paul <no...@apache.org>
Authored: Fri May 26 15:39:27 2017 +0930
Committer: Noble Paul <no...@apache.org>
Committed: Fri May 26 15:39:27 2017 +0930
----------------------------------------------------------------------
.../solr/cloud/autoscaling/AutoScalingHandlerTest.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------