stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

7167293: FtpURLConnection connection leak on FileNotFoundException

Browse Source 
Reviewed-by: chegar, rriggs
This commit is contained in:
Vyom Tewari 2016-04-05 17:07:56 +01:00
parent eb520934e7
commit 2dcd96060e
2 changed files with 188 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
jdk/src/java.base/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1994, 2016, 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
@ -299,6 +299,13 @@ public class FtpURLConnection extends URLConnection {
// Just keep throwing for now.
throw e;
} catch (FtpProtocolException fe) {
if (ftp != null) {
try {
ftp.close();
} catch (IOException ioe) {
fe.addSuppressed(ioe);
}
}
throw new IOException(fe);
}
try {
@ -481,11 +488,34 @@ public class FtpURLConnection extends URLConnection {
msgh.add("content-type", "text/plain");
msgh.add("access-type", "directory");
} catch (IOException ex) {
throw new FileNotFoundException(fullpath);
FileNotFoundException fnfe = new FileNotFoundException(fullpath);
if (ftp != null) {
try {
ftp.close();
} catch (IOException ioe) {
fnfe.addSuppressed(ioe);
}
}
throw fnfe;
} catch (FtpProtocolException ex2) {
throw new FileNotFoundException(fullpath);
FileNotFoundException fnfe = new FileNotFoundException(fullpath);
if (ftp != null) {
try {
ftp.close();
} catch (IOException ioe) {
fnfe.addSuppressed(ioe);
}
}
throw fnfe;
}
} catch (FtpProtocolException ftpe) {
if (ftp != null) {
try {
ftp.close();
} catch (IOException ioe) {
ftpe.addSuppressed(ioe);
}
}
throw new IOException(ftpe);
}
setProperties(msgh);

155
jdk/test/sun/net/ftp/FtpURLConnectionLeak.java Normal file
View File

@ -0,0 +1,155 @@
/*
* Copyright (c) 2016, 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.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 7167293
* @summary FtpURLConnection doesn't close FTP connection when FileNotFoundException is thrown
* @library ../www/ftptest/
* @build FtpServer FtpCommandHandler FtpAuthHandler FtpFileSystemHandler
* @run main FtpURLConnectionLeak
*/
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
public class FtpURLConnectionLeak {
public static void main(String[] args) throws Exception {
FtpServer server = new FtpServer(0);
server.setFileSystemHandler(new CustomFileSystemHandler("/"));
server.setAuthHandler(new MyAuthHandler());
int port = server.getLocalPort();
server.start();
URL url = new URL("ftp://localhost:" + port + "/filedoesNotExist.txt");
for (int i = 0; i < 3; i++) {
try {
InputStream stream = url.openStream();
} catch (FileNotFoundException expectedFirstTimeAround) {
// should always reach this point since the path does not exist
} catch (IOException expected) {
System.out.println("caught expected " + expected);
int times = 1;
do {
// give some time to close the connection...
System.out.println("sleeping... " + times);
Thread.sleep(times * 1000);
} while (server.activeClientsCount() > 0 && times++ < 5);
if (server.activeClientsCount() > 0) {
server.killClients();
throw new RuntimeException("URLConnection didn't close the" +
" FTP connection on FileNotFoundException");
}
} finally {
server.terminate();
}
}
}
static class CustomFileSystemHandler implements FtpFileSystemHandler {
private String currentDir;
public CustomFileSystemHandler(String path) {
currentDir = path;
}
@Override
public boolean cd(String path) {
currentDir = path;
return true;
}
@Override
public boolean cdUp() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public String pwd() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean fileExists(String name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public InputStream getFile(String name) {
return null; //return null so that server will return 550 File not found.
}
@Override
public long getFileSize(String name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public InputStream listCurrentDir() {
return null;
}
@Override
public OutputStream putFile(String name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean removeFile(String name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean mkdir(String name) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public boolean rename(String from, String to) {
throw new UnsupportedOperationException("Not supported yet.");
}
}
static class MyAuthHandler implements FtpAuthHandler {
@Override
public int authType() {
return 0;
}
@Override
public boolean authenticate(String user, String password) {
return true;
}
@Override
public boolean authenticate(String user, String password, String account) {
return true;
}
}
}