You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2017/05/10 12:35:29 UTC
[42/50] [abbrv] lucene-solr:jira/solr-10290: SOLR-10639: Fix NPE in
LRU/LFU/FastLRU caches toString method
SOLR-10639: Fix NPE in LRU/LFU/FastLRU caches toString method
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/46e61335
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/46e61335
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/46e61335
Branch: refs/heads/jira/solr-10290
Commit: 46e6133540bfb018da9f463bc970b041dc9f1b25
Parents: 4b116a9
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Mon May 8 17:11:35 2017 -0700
Committer: Cassandra Targett <ca...@lucidworks.com>
Committed: Wed May 10 07:30:33 2017 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/search/FastLRUCache.java | 2 +-
solr/core/src/java/org/apache/solr/search/LFUCache.java | 2 +-
solr/core/src/java/org/apache/solr/search/LRUCache.java | 2 +-
4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46e61335/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index de3ce0b..0c4eb33 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -324,6 +324,8 @@ Bug Fixes
* SOLR-10630: HttpSolrCall.getAuthCtx().new AuthorizationContext() {...}.getParams()
sometimes throws java.lang.NullPointerException (hu xiaodong via shalin)
+* SOLR-10639: Fix NPE on LRU/FastLRU/LFU toString method (Tomás Fernández Löbbe)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46e61335/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/FastLRUCache.java b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
index cb699b2..1cf4443 100644
--- a/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
+++ b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java
@@ -292,7 +292,7 @@ public class FastLRUCache<K, V> extends SolrCacheBase implements SolrCache<K,V>
@Override
public String toString() {
- return name() + cacheMap != null ? cacheMap.getValue().toString() : "";
+ return name() + (cacheMap != null ? cacheMap.getValue().toString() : "");
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46e61335/solr/core/src/java/org/apache/solr/search/LFUCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/LFUCache.java b/solr/core/src/java/org/apache/solr/search/LFUCache.java
index 82ba6d2..f502b03 100644
--- a/solr/core/src/java/org/apache/solr/search/LFUCache.java
+++ b/solr/core/src/java/org/apache/solr/search/LFUCache.java
@@ -308,7 +308,7 @@ public class LFUCache<K, V> implements SolrCache<K, V> {
@Override
public String toString() {
- return name + cacheMap != null ? cacheMap.getValue().toString() : "";
+ return name + (cacheMap != null ? cacheMap.getValue().toString() : "");
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/46e61335/solr/core/src/java/org/apache/solr/search/LRUCache.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/LRUCache.java b/solr/core/src/java/org/apache/solr/search/LRUCache.java
index ce206fe..cbd3979 100644
--- a/solr/core/src/java/org/apache/solr/search/LRUCache.java
+++ b/solr/core/src/java/org/apache/solr/search/LRUCache.java
@@ -375,7 +375,7 @@ public class LRUCache<K,V> extends SolrCacheBase implements SolrCache<K,V>, Acco
@Override
public String toString() {
- return name() + cacheMap != null ? cacheMap.getValue().toString() : "";
+ return name() + (cacheMap != null ? cacheMap.getValue().toString() : "");
}
@Override