You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2018/09/17 14:06:50 UTC
[1/2] lucene-solr:branch_7x: LUCENE-8503: Call #getDelegate instead
of direct member access during unwrap
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7_5 f9b2f0939 -> d98e4929a
refs/heads/branch_7x 922e01624 -> 7fe2281f1
LUCENE-8503: Call #getDelegate instead of direct member access during unwrap
Filter*Reader instances access the member or the delegate directly instead of
calling getDelegate(). In order to track access of the delegate these methods
should call #getDelegat()
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/7fe2281f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7fe2281f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7fe2281f
Branch: refs/heads/branch_7x
Commit: 7fe2281f12ef646804aba175f70c18353f65ba37
Parents: 922e016
Author: Simon Willnauer <si...@apache.org>
Authored: Mon Sep 17 10:39:41 2018 +0200
Committer: Simon Willnauer <si...@apache.org>
Committed: Mon Sep 17 16:06:10 2018 +0200
----------------------------------------------------------------------
.../core/src/java/org/apache/lucene/index/FilterCodecReader.java | 4 ++--
.../src/java/org/apache/lucene/index/FilterDirectoryReader.java | 2 +-
.../core/src/java/org/apache/lucene/index/FilterLeafReader.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7fe2281f/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
index 0f8dcfc..ff3ea18 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
@@ -48,8 +48,8 @@ public abstract class FilterCodecReader extends CodecReader {
}
return reader;
}
- /**
- * The underlying CodecReader instance.
+ /**
+ * The underlying CodecReader instance.
*/
protected final CodecReader in;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7fe2281f/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
index 4a9cd68..70ecd12 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
@@ -37,7 +37,7 @@ public abstract class FilterDirectoryReader extends DirectoryReader {
* an instance of {@link FilterDirectoryReader}. */
public static DirectoryReader unwrap(DirectoryReader reader) {
while (reader instanceof FilterDirectoryReader) {
- reader = ((FilterDirectoryReader) reader).in;
+ reader = ((FilterDirectoryReader) reader).getDelegate();
}
return reader;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/7fe2281f/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
index 0450038..6ab45f3 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
@@ -44,7 +44,7 @@ public abstract class FilterLeafReader extends LeafReader {
* an instance of {@link FilterLeafReader}. */
public static LeafReader unwrap(LeafReader reader) {
while (reader instanceof FilterLeafReader) {
- reader = ((FilterLeafReader) reader).in;
+ reader = ((FilterLeafReader) reader).getDelegate();
}
return reader;
}
[2/2] lucene-solr:branch_7_5: LUCENE-8503: Call #getDelegate instead
of direct member access during unwrap
Posted by si...@apache.org.
LUCENE-8503: Call #getDelegate instead of direct member access during unwrap
Filter*Reader instances access the member or the delegate directly instead of
calling getDelegate(). In order to track access of the delegate these methods
should call #getDelegat()
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d98e4929
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d98e4929
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d98e4929
Branch: refs/heads/branch_7_5
Commit: d98e4929a0ea55e8cae4f791ad705f6b776c7c7f
Parents: f9b2f09
Author: Simon Willnauer <si...@apache.org>
Authored: Mon Sep 17 10:39:41 2018 +0200
Committer: Simon Willnauer <si...@apache.org>
Committed: Mon Sep 17 16:06:31 2018 +0200
----------------------------------------------------------------------
.../core/src/java/org/apache/lucene/index/FilterCodecReader.java | 4 ++--
.../src/java/org/apache/lucene/index/FilterDirectoryReader.java | 2 +-
.../core/src/java/org/apache/lucene/index/FilterLeafReader.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d98e4929/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
index 0f8dcfc..ff3ea18 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
@@ -48,8 +48,8 @@ public abstract class FilterCodecReader extends CodecReader {
}
return reader;
}
- /**
- * The underlying CodecReader instance.
+ /**
+ * The underlying CodecReader instance.
*/
protected final CodecReader in;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d98e4929/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
index 4a9cd68..70ecd12 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java
@@ -37,7 +37,7 @@ public abstract class FilterDirectoryReader extends DirectoryReader {
* an instance of {@link FilterDirectoryReader}. */
public static DirectoryReader unwrap(DirectoryReader reader) {
while (reader instanceof FilterDirectoryReader) {
- reader = ((FilterDirectoryReader) reader).in;
+ reader = ((FilterDirectoryReader) reader).getDelegate();
}
return reader;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d98e4929/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
index 0450038..6ab45f3 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java
@@ -44,7 +44,7 @@ public abstract class FilterLeafReader extends LeafReader {
* an instance of {@link FilterLeafReader}. */
public static LeafReader unwrap(LeafReader reader) {
while (reader instanceof FilterLeafReader) {
- reader = ((FilterLeafReader) reader).in;
+ reader = ((FilterLeafReader) reader).getDelegate();
}
return reader;
}