You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/17 21:57:53 UTC
lucene-solr:branch_5_5: SOLR-9134: Fix RestManager.addManagedResource
return value.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 f249b61dc -> bdd35e9de
SOLR-9134: Fix RestManager.addManagedResource return value.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bdd35e9d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bdd35e9d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bdd35e9d
Branch: refs/heads/branch_5_5
Commit: bdd35e9de6ecfabf32368e7e4b78db02939a7543
Parents: f249b61
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon May 23 16:22:20 2016 +0100
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 17:56:05 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/rest/RestManager.java | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bdd35e9d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 98696b9..55097e9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -74,6 +74,8 @@ Bug Fixes
* SOLR-8801: /bin/solr create script always returns exit code 0 when a collection/core already exists.
(Khalid Alharbi, Marius Grama via Steve Rowe)
+* SOLR-9134: Fix RestManager.addManagedResource return value. (Christine Poerschke)
+
======================= 5.5.1 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bdd35e9d/solr/core/src/java/org/apache/solr/rest/RestManager.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/rest/RestManager.java b/solr/core/src/java/org/apache/solr/rest/RestManager.java
index 1c095cb..7e3f4d4 100644
--- a/solr/core/src/java/org/apache/solr/rest/RestManager.java
+++ b/solr/core/src/java/org/apache/solr/rest/RestManager.java
@@ -647,11 +647,11 @@ public class RestManager {
* Restlet router. Returns the corresponding instance.
*/
public synchronized ManagedResource addManagedResource(String resourceId, Class<? extends ManagedResource> clazz) {
- ManagedResource res = null;
- ManagedResourceRegistration existingReg = registry.registered.get(resourceId);
+ final ManagedResource res;
+ final ManagedResourceRegistration existingReg = registry.registered.get(resourceId);
if (existingReg == null) {
registry.registerManagedResource(resourceId, clazz, null);
- addRegisteredResource(registry.registered.get(resourceId));
+ res = addRegisteredResource(registry.registered.get(resourceId));
} else {
res = getManagedResource(resourceId);
}