Author: markt
Date: Thu Oct 12 10:08:19 2017
New Revision: 1811936
URL: http://svn.apache.org/viewvc?rev=1811936&view=rev
Log:
Remove deprecated code
Modified:
tomcat/trunk/java/org/apache/tomcat/Jar.java
tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
Modified: tomcat/trunk/java/org/apache/tomcat/Jar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/Jar.java?rev=1811936&r1=1811935&r2=1811936&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/Jar.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/Jar.java Thu Oct 12 10:08:19 2017
@@ -40,21 +40,6 @@ public interface Jar extends AutoCloseab
URL getJarFileURL();
/**
- * Determines if a specific entry exists within the JAR.
- *
- * @param name Entry to look for
- * @return Implementations will always return {@code false}
- *
- * @throws IOException if an I/O error occurs while processing the JAR file
- * entries
- *
- * @deprecated Unused. This will be removed in Tomcat 9 onwards.
- */
- @Deprecated
- boolean entryExists(String name) throws IOException;
-
-
- /**
* Obtain an {@link InputStream} for a given entry in a JAR. The caller is
* responsible for closing the stream.
*
Modified:
tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java?rev=1811936&r1=1811935&r2=1811936&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
Thu Oct 12 10:08:19 2017
@@ -81,13 +81,6 @@ public abstract class AbstractInputStrea
@Override
- @Deprecated
- public boolean entryExists(String name) throws IOException {
- return false;
- }
-
-
- @Override
public InputStream getInputStream(String name) throws IOException {
gotoEntry(name);
if (entry == null) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java?rev=1811936&r1=1811935&r2=1811936&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/scan/JarFileUrlJar.java Thu Oct 12
10:08:19 2017
@@ -70,12 +70,6 @@ public class JarFileUrlJar implements Ja
@Override
- @Deprecated
- public boolean entryExists(String name) {
- return false;
- }
-
- @Override
public InputStream getInputStream(String name) throws IOException {
ZipEntry entry = jarFile.getEntry(name);
if (entry == null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
