< prev index next >

modules/javafx.web/src/main/java/javafx/scene/web/DirectoryLock.java

Print this page

        

*** 23,47 **** * questions. */ package javafx.scene.web; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; import static java.lang.String.format; import java.nio.channels.FileLock; import java.nio.channels.OverlappingFileLockException; import java.util.HashMap; import java.util.Map; - import java.util.logging.Level; - import java.util.logging.Logger; final class DirectoryLock { ! private static final Logger logger = ! Logger.getLogger(DirectoryLock.class.getName()); private static final Map<File,Descriptor> descriptors = new HashMap<>(); private Descriptor descriptor; --- 23,46 ---- * questions. */ package javafx.scene.web; + import com.sun.javafx.logging.PlatformLogger; import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; import static java.lang.String.format; import java.nio.channels.FileLock; import java.nio.channels.OverlappingFileLockException; import java.util.HashMap; import java.util.Map; final class DirectoryLock { ! private static final PlatformLogger logger = ! PlatformLogger.getLogger(DirectoryLock.class.getName()); private static final Map<File,Descriptor> descriptors = new HashMap<>(); private Descriptor descriptor;
*** 68,78 **** } finally { if (descriptor == null) { // tryLock failed try { lockRaf.close(); } catch (IOException ex) { ! logger.log(Level.WARNING, format("Error closing [%s]", lockFile), ex); } } } } --- 67,77 ---- } finally { if (descriptor == null) { // tryLock failed try { lockRaf.close(); } catch (IOException ex) { ! logger.warning(format("Error closing [%s]", lockFile), ex); } } } }
*** 87,103 **** descriptor.referenceCount--; if (descriptor.referenceCount == 0) { try { descriptor.lock.release(); } catch (IOException ex) { ! logger.log(Level.WARNING, format("Error releasing " ! + "lock on [%s]", lockFile(descriptor.directory)), ex); } try { descriptor.lockRaf.close(); } catch (IOException ex) { ! logger.log(Level.WARNING, format("Error closing [%s]", lockFile(descriptor.directory)), ex); } descriptors.remove(descriptor.directory); } descriptor = null; --- 86,102 ---- descriptor.referenceCount--; if (descriptor.referenceCount == 0) { try { descriptor.lock.release(); } catch (IOException ex) { ! logger.warning(format("Error releasing lock on [%s]", ! lockFile(descriptor.directory)), ex); } try { descriptor.lockRaf.close(); } catch (IOException ex) { ! logger.warning(format("Error closing [%s]", lockFile(descriptor.directory)), ex); } descriptors.remove(descriptor.directory); } descriptor = null;
< prev index next >