From c9910cec1363d1b8bf0df3698af05ca0a6410bd8 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 13 Oct 2022 09:53:39 -0500 Subject: [PATCH] ServerListener uses Path as it has to Write a file reliably --- .../eclipse/jetty/ee10/maven/plugin/ServerListener.java | 8 ++++---- .../eclipse/jetty/ee9/maven/plugin/ServerListener.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/ServerListener.java b/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/ServerListener.java index cb21f9265aa..09a6d2f3ac1 100644 --- a/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/ServerListener.java +++ b/jetty-ee10/jetty-ee10-maven-plugin/src/main/java/org/eclipse/jetty/ee10/maven/plugin/ServerListener.java @@ -14,10 +14,9 @@ package org.eclipse.jetty.ee10.maven.plugin; import java.nio.file.Files; +import java.nio.file.Path; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.resource.Resource; -import org.eclipse.jetty.util.resource.ResourceFactory; /** * ServerListener @@ -47,8 +46,9 @@ public class ServerListener implements LifeCycle.Listener { try { - Resource r = ResourceFactory.root().newResource(_tokenFile); // TODO leak - Files.createFile(r.getPath()); + // Using Path, as we need to reliably create/write a file. + Path path = Path.of(_tokenFile); + Files.createFile(path); } catch (Exception e) { diff --git a/jetty-ee9/jetty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/ServerListener.java b/jetty-ee9/jetty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/ServerListener.java index c8aee4d21e6..22b354e913b 100644 --- a/jetty-ee9/jetty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/ServerListener.java +++ b/jetty-ee9/jetty-ee9-maven-plugin/src/main/java/org/eclipse/jetty/ee9/maven/plugin/ServerListener.java @@ -14,10 +14,9 @@ package org.eclipse.jetty.ee9.maven.plugin; import java.nio.file.Files; +import java.nio.file.Path; import org.eclipse.jetty.util.component.LifeCycle; -import org.eclipse.jetty.util.resource.Resource; -import org.eclipse.jetty.util.resource.ResourceFactory; /** * ServerListener @@ -47,8 +46,9 @@ public class ServerListener implements LifeCycle.Listener { try { - Resource r = ResourceFactory.root().newResource(_tokenFile); // TODO leak - Files.createFile(r.getPath()); + // Using Path, as we need to reliably create/write a file. + Path path = Path.of(_tokenFile); + Files.createFile(path); } catch (Exception e) {