Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

correctly close ZipInputstream #1520 

Signed-off-by: olivier lamy <olamy@webtide.com>
This commit is contained in:
olivier lamy 2017-05-17 10:55:11 +10:00
parent e9f75e81d9
commit 8b94f2f275
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
View File

@ -147,29 +147,30 @@ public class PropertyUserStore extends UserStore implements PathWatcher.Listener
private Path extractPackedFile( String configFile )
throws IOException
{
int fileIndex = configFile.indexOf( "!" );
String filePath = configFile.substring( JAR_FILE.length(), fileIndex );
String entryPath = configFile.substring( fileIndex + 1, configFile.length() );
try (FileInputStream fileInputStream = new FileInputStream( new File( filePath ) ))
{
ZipInputStream zin = new ZipInputStream( fileInputStream );
for ( ZipEntry e; ( e = zin.getNextEntry() ) != null; )
try (ZipInputStream zin = new ZipInputStream( fileInputStream ))
{
if ( e.getName().equals( entryPath ) )
for ( ZipEntry e; ( e = zin.getNextEntry() ) != null; )
{
Path extractedPath = Files.createTempFile( "users_store", ".tmp" );
byte[] buffer = new byte[1024];
int bytesRead;
try (OutputStream textOutputStream = Files.newOutputStream( extractedPath ))
if ( e.getName().equals( entryPath ) )
{
while ( ( bytesRead = zin.read( buffer ) ) != -1 )
Path extractedPath = Files.createTempFile( "users_store", ".tmp" );
byte[] buffer = new byte[1024];
int bytesRead;
try (OutputStream textOutputStream = Files.newOutputStream( extractedPath ))
{
textOutputStream.write( buffer, 0, bytesRead );
while ( ( bytesRead = zin.read( buffer ) ) != -1 )
{
textOutputStream.write( buffer, 0, bytesRead );
}
}
return extractedPath;
}
return extractedPath;
}
}
}