Thanks for spotting this. On Thu, Jan 15, 2015 at 5:58 PM, Robert Metzger <rmetz...@apache.org> wrote:
> Looks like this commit was pushed to the wrong branch. > > On Thu, Jan 15, 2015 at 5:10 PM, <u...@apache.org> wrote: > > > Repository: flink > > Updated Branches: > > refs/heads/mastaer [created] 22fdf7668 > > > > > > [FLINK-1183] Generate gentle notification message when Flink is started > > with Java 6 > > > > This closes #296. > > > > > > Project: http://git-wip-us.apache.org/repos/asf/flink/repo > > Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/22fdf766 > > Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/22fdf766 > > Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/22fdf766 > > > > Branch: refs/heads/mastaer > > Commit: 22fdf76682b69a27de87a221dc47466484a0d9f3 > > Parents: d62ab47 > > Author: Ajay Bhat <ajayb...@air-watch.com> > > Authored: Sun Jan 11 00:51:11 2015 +0530 > > Committer: Ufuk Celebi <u...@apache.org> > > Committed: Thu Jan 15 17:10:00 2015 +0100 > > > > ---------------------------------------------------------------------- > > .../apache/flink/runtime/jobmanager/JobManager.scala | 12 > ++++++++++++ > > 1 file changed, 12 insertions(+) > > ---------------------------------------------------------------------- > > > > > > > > > http://git-wip-us.apache.org/repos/asf/flink/blob/22fdf766/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala > > ---------------------------------------------------------------------- > > diff --git > > > a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala > > > b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala > > index 3dfd70f..16495ca 100644 > > --- > > > a/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala > > +++ > > > b/flink-runtime/src/main/scala/org/apache/flink/runtime/jobmanager/JobManager.scala > > @@ -60,6 +60,8 @@ Actor with ActorLogMessages with ActorLogging { > > > > log.info(s"Starting job manager at ${self.path}.") > > > > + checkJavaVersion > > + > > val (archiveCount, > > profiling, > > cleanupInterval, > > @@ -443,6 +445,16 @@ Actor with ActorLogMessages with ActorLogging { > > log.error(t, s"Could not properly unregister job ${jobID} form > > the library cache.") > > } > > } > > + > > + private def checkJavaVersion { > > + var javaVersion = System.getProperty("java.version") > > + if (javaVersion.substring(0, 3).toDouble < 1.7) { > > + JobManager.LOG.warn("Warning: Flink is running with Java 6. " + > > + "Java 6 is not maintained any more by Oracle or the OpenJDK > > community. " + > > + "Flink currently supports Java 6, but may not in future > > releases," + > > + " due to the unavailability of bug fixes security patched.") > > + } > > + } > > } > > > > object JobManager { > > > > >
