From 8381a562da8eab5e38d46164fa4679aac34fcc50 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Tue, 5 May 2015 22:32:58 -0700 Subject: [PATCH] use APIs available on < 1.8 jdk --- .../loaded/agent/ReloadableFileChangeListener.java | 4 ++-- .../test/java/org/springsource/loaded/test/ReloadingJVM.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/springloaded/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java b/springloaded/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java index ee3abe8..a455499 100644 --- a/springloaded/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java +++ b/springloaded/src/main/java/org/springsource/loaded/agent/ReloadableFileChangeListener.java @@ -82,7 +82,7 @@ public class ReloadableFileChangeListener implements FileChangeListener { Set entriesBeingWatched = watchedJarContents.get(file); for (JarEntry entryBeingWatched : entriesBeingWatched) { ZipEntry ze = zf.getEntry(entryBeingWatched.slashname); - long lmt = ze.getLastModifiedTime().toMillis(); + long lmt = ze.getTime();//getLastModifiedTime().toMillis(); if (lmt > entryBeingWatched.lmt) { // entry in jar has been updated if (GlobalConfiguration.isRuntimeLogging && log.isLoggable(Level.INFO)) { @@ -112,7 +112,7 @@ public class ReloadableFileChangeListener implements FileChangeListener { ZipFile zf = new ZipFile(file); String slashname = rtype.getSlashedName() + ".class"; ZipEntry ze = zf.getEntry(slashname); - long lmt = ze.getLastModifiedTime().toMillis(); + long lmt = ze.getTime();//LastModifiedTime().toMillis(); JarEntry je = new JarEntry(rtype, slashname, lmt); zf.close(); Set jarEntries = watchedJarContents.get(file); diff --git a/springloaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java b/springloaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java index d5bc3bb..010abe7 100644 --- a/springloaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java +++ b/springloaded/src/test/java/org/springsource/loaded/test/ReloadingJVM.java @@ -23,7 +23,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.nio.file.attribute.FileTime; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; @@ -315,10 +314,10 @@ public class ReloadingJVM { } // System.out.println("LMT for " + ze.getName() + " is " + new Date(ze.getLastModifiedTime().toMillis())); if (!found) { - newZipEntry.setLastModifiedTime(ze.getLastModifiedTime()); + newZipEntry.setTime(ze.getTime());//LastModifiedTime()); } else { - newZipEntry.setLastModifiedTime(FileTime.fromMillis(newtime)); + newZipEntry.setTime(newtime);//FileTime.fromMillis(newtime)); } // System.out.println("LMT for " + ze.getName() + " is updated to " // + new Date(newZipEntry.getLastModifiedTime().toMillis()));