You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/02/20 01:24:36 UTC
[1/2] lucene-solr:master: Fix (generic) return type
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x ccd9733fa -> f5b324ce6
refs/heads/master f45a3711b -> 5fb94cee6
Fix (generic) return type
w/o this change class won't compile using jdk9-ea157
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5fb94cee
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5fb94cee
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5fb94cee
Branch: refs/heads/master
Commit: 5fb94cee68b29bae394fa95753de555cf9ac10ff
Parents: f45a371
Author: Chris Hostetter <ho...@apache.org>
Authored: Sun Feb 19 18:09:35 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Sun Feb 19 18:09:35 2017 -0700
----------------------------------------------------------------------
solr/solrj/src/java/org/apache/solr/common/util/NamedList.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/5fb94cee/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
index 979c67a..0313d3a 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
@@ -393,8 +393,8 @@ public class NamedList<T> implements Cloneable, Serializable, Iterable<Map.Entry
return sb.toString();
}
- public NamedList getImmutableCopy() {
- NamedList copy = clone();
+ public NamedList<T> getImmutableCopy() {
+ NamedList<T> copy = clone();
return new NamedList<>( Collections.unmodifiableList(copy.nvPairs));
}
[2/2] lucene-solr:branch_6x: Fix (generic) return type
Posted by ho...@apache.org.
Fix (generic) return type
w/o this change class won't compile using jdk9-ea157
(cherry picked from commit 5fb94cee68b29bae394fa95753de555cf9ac10ff)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f5b324ce
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f5b324ce
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f5b324ce
Branch: refs/heads/branch_6x
Commit: f5b324ce6b4c912591d720184d724499575055f2
Parents: ccd9733
Author: Chris Hostetter <ho...@apache.org>
Authored: Sun Feb 19 18:09:35 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Sun Feb 19 18:10:07 2017 -0700
----------------------------------------------------------------------
solr/solrj/src/java/org/apache/solr/common/util/NamedList.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f5b324ce/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
index 979c67a..0313d3a 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java
@@ -393,8 +393,8 @@ public class NamedList<T> implements Cloneable, Serializable, Iterable<Map.Entry
return sb.toString();
}
- public NamedList getImmutableCopy() {
- NamedList copy = clone();
+ public NamedList<T> getImmutableCopy() {
+ NamedList<T> copy = clone();
return new NamedList<>( Collections.unmodifiableList(copy.nvPairs));
}