jdk-sandbox: comparison langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/ZipFileIndex.java

equal deleted inserted replaced

-:228abfa87080
+:8369cde9152a
 /*
-* Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 */
 package com.sun.tools.javac.file;
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.RandomAccessFile;
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.zip.DataFormatException;
 import java.util.zip.Inflater;
 Collections.<RelativeDirectory, DirectoryEntry>emptyMap();
 private Set<RelativeDirectory> allDirs =
 Collections.<RelativeDirectory>emptySet();
 // ZipFileIndex data entries
-final File zipFile;
+final Path zipFile;
-private Reference<File> absFileRef;
+private Reference<Path> absFileRef;
 long zipFileLastModified = NOT_MODIFIED;
 private RandomAccessFile zipRandomFile;
 private Entry[] entries;
 private boolean readFromIndex = false;
-private File zipIndexFile = null;
+private Path zipIndexFile = null;
 private boolean triedToReadIndex = false;
 final RelativeDirectory symbolFilePrefix;
 private final int symbolFilePrefixLength;
 private boolean hasPopulatedData = false;
 long lastReferenceTimeStamp = NOT_MODIFIED;
 public synchronized boolean isOpen() {
 return (zipRandomFile != null);
 }
-ZipFileIndex(File zipFile, RelativeDirectory symbolFilePrefix, boolean writeIndex,
+ZipFileIndex(Path zipFile, RelativeDirectory symbolFilePrefix, boolean writeIndex,
 boolean useCache, String cacheLocation) throws IOException {
 this.zipFile = zipFile;
 this.symbolFilePrefix = symbolFilePrefix;
 this.symbolFilePrefixLength = (symbolFilePrefix == null ? 0 :
 symbolFilePrefix.getPath().getBytes("UTF-8").length);
 this.writeIndex = writeIndex;
 this.usePreindexedCache = useCache;
 this.preindexedCacheLocation = cacheLocation;
 if (zipFile != null) {
-this.zipFileLastModified = zipFile.lastModified();
+this.zipFileLastModified = Files.getLastModifiedTime(zipFile).toMillis();
 }
 // Validate integrity of the zip file
 checkIndex();
 }
 closeFile();
 super.finalize();
 }
 private boolean isUpToDate() {
-if (zipFile != null
+try {
-&& ((!NON_BATCH_MODE) || zipFileLastModified == zipFile.lastModified())
+return (zipFile != null
-&& hasPopulatedData) {
+&& ((!NON_BATCH_MODE) || zipFileLastModified == Files.getLastModifiedTime(zipFile).toMillis())
-return true;
+&& hasPopulatedData);
+} catch (IOException ignore) {
 }
 return false;
 }
 lastReferenceTimeStamp = System.currentTimeMillis();
 }
 private void openFile() throws FileNotFoundException {
 if (zipRandomFile == null && zipFile != null) {
-zipRandomFile = new RandomAccessFile(zipFile, "r");
+zipRandomFile = new RandomAccessFile(zipFile.toFile(), "r");
 }
 }
 private void cleanupState() {
 // Make sure there is a valid but empty index if the file doesn't exist
 for (int i = from; i < to; i++) {
 entries.add(zipFileIndex.entries[i]);
 }
 } else {
-File indexFile = zipFileIndex.getIndexFile();
+Path indexFile = zipFileIndex.getIndexFile();
 if (indexFile != null) {
 RandomAccessFile raf = null;
 try {
-raf = new RandomAccessFile(indexFile, "r");
+raf = new RandomAccessFile(indexFile.toFile(), "r");
 raf.seek(writtenOffsetOffset);
 for (int nFiles = 0; nFiles < numEntries; nFiles++) {
 // Read the name bytes
 int zfieNameBytesLen = raf.readInt();
 boolean ret = false;
 synchronized (this) {
 triedToReadIndex = true;
 RandomAccessFile raf = null;
 try {
-File indexFileName = getIndexFile();
+Path indexFileName = getIndexFile();
-raf = new RandomAccessFile(indexFileName, "r");
+raf = new RandomAccessFile(indexFileName.toFile(), "r");
 long fileStamp = raf.readLong();
-if (zipFile.lastModified() != fileStamp) {
+if (Files.getLastModifiedTime(zipFile).toMillis() != fileStamp) {
 ret = false;
 } else {
 directories = new LinkedHashMap<>();
 int numDirs = raf.readInt();
 for (int nDirs = 0; nDirs < numDirs; nDirs++) {
 if (!writeIndex) {
 return true;
 }
-File indexFile = getIndexFile();
+Path indexFile = getIndexFile();
 if (indexFile == null) {
 return false;
 }
 RandomAccessFile raf = null;
 long writtenSoFar = 0;
 try {
-raf = new RandomAccessFile(indexFile, "rw");
+raf = new RandomAccessFile(indexFile.toFile(), "rw");
 raf.writeLong(zipFileLastModified);
 writtenSoFar += 8;
 List<DirectoryEntry> directoriesToWrite = new ArrayList<>();
 synchronized (this) {
 return writeIndex();
 }
 }
-private File getIndexFile() {
+private Path getIndexFile() {
 if (zipIndexFile == null) {
 if (zipFile == null) {
 return null;
 }
-zipIndexFile = new File((preindexedCacheLocation == null ? "" : preindexedCacheLocation) +
+zipIndexFile = Paths.get((preindexedCacheLocation == null ? "" : preindexedCacheLocation) +
-zipFile.getName() + ".index");
+zipFile.getFileName() + ".index");
 }
 return zipIndexFile;
 }
-public File getZipFile() {
+public Path getZipFile() {
 return zipFile;
 }
-File getAbsoluteFile() {
+Path getAbsoluteFile() {
-File absFile = (absFileRef == null ? null : absFileRef.get());
+Path absFile = (absFileRef == null ? null : absFileRef.get());
 if (absFile == null) {
-absFile = zipFile.getAbsoluteFile();
+absFile = zipFile.toAbsolutePath();
 absFileRef = new SoftReference<>(absFile);
 }
 return absFile;
 }

changeset 27225	8369cde9152a
parent 25874	83c19f00452c
child 27226	53535e4e1b08