You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2016/10/27 20:09:22 UTC
[18/50] [abbrv] lucene-solr:jira/solr-8593: SOLR-9536:
OldBackupDirectory timestamp field needs to be initialized to avoid NPE.
SOLR-9536: OldBackupDirectory timestamp field needs to be initialized to avoid NPE.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e152575f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e152575f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e152575f
Branch: refs/heads/jira/solr-8593
Commit: e152575f5ea5ea798ca989c852afb763189dee60
Parents: 27ba8e2
Author: markrmiller <ma...@apache.org>
Authored: Tue Oct 25 12:39:37 2016 -0400
Committer: markrmiller <ma...@apache.org>
Committed: Tue Oct 25 12:39:59 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../core/src/java/org/apache/solr/handler/OldBackupDirectory.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e152575f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 2f4827b..b693543 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -214,6 +214,9 @@ Bug Fixes
* SOLR-9441: Solr collection backup on HDFS can only be manipulated by the Solr process owner.
(Hrishikesh Gadre via Mark Miller)
+* SOLR-9536: OldBackupDirectory timestamp field needs to be initialized to avoid NPE.
+ (Hrishikesh Gadre via Mark Miller)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e152575f/solr/core/src/java/org/apache/solr/handler/OldBackupDirectory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/OldBackupDirectory.java b/solr/core/src/java/org/apache/solr/handler/OldBackupDirectory.java
index 2b19116..79c5f09 100644
--- a/solr/core/src/java/org/apache/solr/handler/OldBackupDirectory.java
+++ b/solr/core/src/java/org/apache/solr/handler/OldBackupDirectory.java
@@ -32,7 +32,7 @@ class OldBackupDirectory implements Comparable<OldBackupDirectory> {
private URI basePath;
private String dirName;
- private Optional<Date> timestamp;
+ private Optional<Date> timestamp = Optional.empty();
public OldBackupDirectory(URI basePath, String dirName) {
this.dirName = Preconditions.checkNotNull(dirName);