Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-07-03 08:44:41 +02:00 · 2019-07-03 08:44:41 +02:00 · e7754f5885
parent 07ee1d8fc6 21857f0b81
commit e7754f5885
1 changed files with 3 additions and 3 deletions
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
@ -308,9 +308,9 @@ public abstract class Resource implements ResourceFactory, Closeable
        return r.isContainedIn(containingResource);
    }

-    /**
-     * @checkstyle-disable-check : NoFinalizerCheck
-     */
+
+    //@checkstyle-disable-check : NoFinalizer
+    //@checkstyle-enable-check : NoFinalizer
    public abstract boolean isContainedIn(Resource r) throws MalformedURLException;

    /**