Merge pull request #322 from quartz-scheduler/quart-2.3.x-zemian-pr212

Correct wrong variable null check
quartz-scheduler · Feb 8, 2019 · 4d1a0ee · 4d1a0ee
2 parents fe84e58 + 4dec148
commit 4d1a0ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -12,6 +12,7 @@
 * #281 Fix no setter for dataSource property validateOnCheckout
 * #264 Fix no setter for dataSource property discardIdleConnectionsSeconds
 * #293 Setup Azure CI server for Quartz project
+* #212 QuartzInitializerListener: fix a typo
 
 ## quartz-2.3.0
 

diff --git a/quartz-core/src/main/java/org/quartz/ee/servlet/QuartzInitializerListener.java b/quartz-core/src/main/java/org/quartz/ee/servlet/QuartzInitializerListener.java
@@ -160,7 +160,7 @@ public void contextInitialized(ServletContextEvent sce) {
                 performShutdown = Boolean.valueOf(shutdownPref).booleanValue();
             }
             String shutdownWaitPref = servletContext.getInitParameter("quartz:wait-on-shutdown");
-            if (shutdownPref != null) {
+            if (shutdownWaitPref != null) {
                 waitOnShutdown = Boolean.valueOf(shutdownWaitPref).booleanValue();
             }