Updated Branches: refs/heads/camel-2.12.x a85acbc42 -> 79b6f562d refs/heads/master 431daf45d -> 2c3239eed
CAMEL-7088: quartz component should close io stream. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2c3239ee Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2c3239ee Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2c3239ee Branch: refs/heads/master Commit: 2c3239eedef40787b3d17839f365ed564b5c348b Parents: 431daf4 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Dec 24 16:30:21 2013 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Dec 24 16:30:21 2013 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/quartz/QuartzComponent.java | 5 +++++ .../org/apache/camel/component/quartz2/QuartzComponent.java | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/2c3239ee/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java index f852115..d748326 100644 --- a/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java +++ b/components/camel-quartz/src/main/java/org/apache/camel/component/quartz/QuartzComponent.java @@ -30,6 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.camel.CamelContext; import org.apache.camel.StartupListener; import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.util.IOHelper; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.quartz.CronTrigger; @@ -435,6 +436,8 @@ public class QuartzComponent extends DefaultComponent implements StartupListener answer.load(is); } catch (IOException e) { throw new SchedulerException("Error loading Quartz properties file from classpath: " + getPropertiesFile(), e); + } finally { + IOHelper.close(is); } } return answer; @@ -475,6 +478,8 @@ public class QuartzComponent extends DefaultComponent implements StartupListener prop.load(is); } catch (IOException e) { throw new SchedulerException("Error loading Quartz properties file from classpath: org/quartz/quartz.properties", e); + } finally { + IOHelper.close(is); } // camel context name will be a suffix to use one scheduler per context http://git-wip-us.apache.org/repos/asf/camel/blob/2c3239ee/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java ---------------------------------------------------------------------- diff --git a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java index a7eded9..3e71e51 100644 --- a/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java +++ b/components/camel-quartz2/src/main/java/org/apache/camel/component/quartz2/QuartzComponent.java @@ -27,6 +27,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.Endpoint; import org.apache.camel.StartupListener; import org.apache.camel.impl.DefaultComponent; +import org.apache.camel.util.IOHelper; import org.apache.camel.util.IntrospectionSupport; import org.apache.camel.util.ObjectHelper; import org.quartz.Scheduler; @@ -155,6 +156,8 @@ public class QuartzComponent extends DefaultComponent implements StartupListener prop.load(is); } catch (IOException e) { throw new SchedulerException("Error loading Quartz properties file from classpath: org/quartz/quartz.properties", e); + } finally { + IOHelper.close(is); } // camel context name will be a suffix to use one scheduler per context @@ -216,6 +219,8 @@ public class QuartzComponent extends DefaultComponent implements StartupListener answer.load(is); } catch (IOException e) { throw new SchedulerException("Error loading Quartz properties file from classpath: " + getPropertiesFile(), e); + } finally { + IOHelper.close(is); } } return answer; @@ -295,7 +300,6 @@ public class QuartzComponent extends DefaultComponent implements StartupListener name = host; } - if (prefixJobNameWithEndpointId) { name = endpoint.getId() + "_" + name; }
