From 5c691d45420e062b0db4c13b8ef812a5677ddff2 Mon Sep 17 00:00:00 2001 From: Shalin Shekhar Mangar Date: Mon, 14 Aug 2017 17:20:59 +0530 Subject: [PATCH] SOLR-10996: Log the right listener config on exception and added a null check before init --- .../cloud/autoscaling/ScheduledTriggers.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java index 1158d01e090..ec9ffc1c846 100644 --- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java +++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/ScheduledTriggers.java @@ -417,7 +417,7 @@ public class ScheduledTriggers implements Closeable { try { oldListener.close(); } catch (Exception e) { - log.warn("Exception closing old listener " + listener.getConfig(), e); + log.warn("Exception closing old listener " + oldListener.getConfig(), e); } } else { listener = oldListener; // reuse @@ -430,17 +430,15 @@ public class ScheduledTriggers implements Closeable { } catch (Exception e) { log.warn("Invalid TriggerListener class name '" + clazz + "', skipping...", e); } - try { - listener.init(coreContainer, config); - listenersPerName.put(config.name, listener); - } catch (Exception e) { - log.warn("Error initializing TriggerListener " + config, e); + if (listener != null) { try { - listener.close(); - } catch (Exception e1) { - // ignore + listener.init(coreContainer, config); + listenersPerName.put(config.name, listener); + } catch (Exception e) { + log.warn("Error initializing TriggerListener " + config, e); + IOUtils.closeQuietly(listener); + listener = null; } - listener = null; } } if (listener == null) {