Skip to content

Commit cfcc1db

Browse files
ivakeggivakegg
committed
re #836: VFSClassLoader multi-thread resource loading
* Updated the class loader tests to show the errors * Updated ZipFileSystem and TarFileSystem with threadlocal files * Working on Ftp test cases
1 parent 2e1fd69 commit cfcc1db

File tree

8 files changed

+420
-217
lines changed

8 files changed

+420
-217
lines changed

‎commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpClientFactory.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private void configureClient(final FileSystemOptions fileSystemOptions, final C
120120
* @return A new connection.
121121
* @throws FileSystemException if an error occurs while connecting.
122122
*/
123-
public C createConnection(final String hostname, final int port, char[] username, char[] password,
123+
public synchronized C createConnection(final String hostname, final int port, char[] username, char[] password,
124124
final String workingDirectory, final FileSystemOptions fileSystemOptions) throws FileSystemException {
125125
// Determine the username and password to use
126126
if (username == null) {

‎commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/tar/TarFileSystem.java‎

Lines changed: 65 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@
1616
*/
1717
package org.apache.commons.vfs2.provider.tar;
1818

19-
import java.io.File;
20-
import java.io.IOException;
21-
import java.io.InputStream;
22-
import java.nio.file.Files;
23-
import java.util.Collection;
24-
import java.util.HashMap;
25-
import java.util.Map;
26-
import java.util.Objects;
27-
import java.util.zip.GZIPInputStream;
28-
2919
import org.apache.commons.compress.archivers.ArchiveEntry;
3020
import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
3121
import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
@@ -44,6 +34,16 @@
4434
import org.apache.commons.vfs2.provider.UriParser;
4535
import org.apache.commons.vfs2.provider.bzip2.Bzip2FileObject;
4636

37+
import java.io.File;
38+
import java.io.IOException;
39+
import java.io.InputStream;
40+
import java.nio.file.Files;
41+
import java.util.Collection;
42+
import java.util.HashMap;
43+
import java.util.Map;
44+
import java.util.Objects;
45+
import java.util.zip.GZIPInputStream;
46+
4747
/**
4848
* A read-only file system for Tar files.
4949
*/
@@ -54,7 +54,53 @@ public class TarFileSystem extends AbstractFileSystem {
5454

5555
private final File file;
5656

57-
private TarArchiveInputStream tarFile;
57+
private TarFileThreadLocal tarFile = new TarFileThreadLocal();
58+
59+
private class TarFileThreadLocal {
60+
61+
private ThreadLocal<Boolean> isPresent = new ThreadLocal<Boolean>() {
62+
@Override
63+
protected Boolean initialValue() {
64+
return Boolean.FALSE;
65+
}
66+
};
67+
private ThreadLocal<TarArchiveInputStream> tarFile = new ThreadLocal<TarArchiveInputStream>() {
68+
@Override
69+
public TarArchiveInputStream initialValue() {
70+
if (isPresent.get()) {
71+
throw new IllegalStateException("Creating an initial value but we already have one");
72+
}
73+
try {
74+
isPresent.set(Boolean.TRUE);
75+
return createTarFile(TarFileSystem.this.file);
76+
} catch (FileSystemException fse) {
77+
throw new RuntimeException(fse);
78+
}
79+
}
80+
};
81+
82+
public TarArchiveInputStream getFile() throws FileSystemException {
83+
try {
84+
return tarFile.get();
85+
} catch (RuntimeException e) {
86+
if (e.getCause() instanceof FileSystemException) {
87+
throw new FileSystemException(e.getCause());
88+
}
89+
else {
90+
throw new RuntimeException(e);
91+
}
92+
}
93+
}
94+
95+
public void closeFile() throws IOException {
96+
if (isPresent.get()) {
97+
TarArchiveInputStream file = tarFile.get();
98+
file.close();
99+
tarFile.remove();
100+
isPresent.set(Boolean.FALSE);
101+
}
102+
}
103+
}
58104

59105
/**
60106
* Cache doesn't need to be synchronized since it is read-only.
@@ -117,10 +163,7 @@ protected TarFileObject createTarFileObject(final AbstractFileName name, final T
117163
protected void doCloseCommunicationLink() {
118164
// Release the tar file
119165
try {
120-
if (tarFile != null) {
121-
tarFile.close();
122-
tarFile = null;
123-
}
166+
tarFile.closeFile();
124167
} catch (final IOException e) {
125168
// getLogger().warn("vfs.provider.tar/close-tar-file.error :" + file, e);
126169
VfsLog.warn(getLogger(), LOG, "vfs.provider.tar/close-tar-file.error :" + file, e);
@@ -147,6 +190,7 @@ public InputStream getInputStream(final TarArchiveEntry entry) throws FileSystem
147190
resetTarFile();
148191
try {
149192
ArchiveEntry next;
193+
TarArchiveInputStream tarFile = getTarFile();
150194
while ((next = tarFile.getNextEntry()) != null) {
151195
if (next.equals(entry)) {
152196
return tarFile;
@@ -159,10 +203,7 @@ public InputStream getInputStream(final TarArchiveEntry entry) throws FileSystem
159203
}
160204

161205
protected TarArchiveInputStream getTarFile() throws FileSystemException {
162-
if (tarFile == null && this.file.exists()) {
163-
recreateTarFile();
164-
}
165-
return tarFile;
206+
return tarFile.getFile();
166207
}
167208

168209
@Override
@@ -225,15 +266,12 @@ protected void putFileToCache(final FileObject file) {
225266
*/
226267

227268
private void recreateTarFile() throws FileSystemException {
228-
if (this.tarFile != null) {
229-
try {
230-
this.tarFile.close();
231-
} catch (final IOException e) {
232-
throw new FileSystemException("vfs.provider.tar/close-tar-file.error", file, e);
233-
}
234-
tarFile = null;
269+
try {
270+
tarFile.closeFile();
271+
} catch (final IOException e) {
272+
throw new FileSystemException("vfs.provider.tar/close-tar-file.error", file, e);
235273
}
236-
this.tarFile = createTarFile(this.file);
274+
tarFile.getFile();
237275
}
238276

239277
/**

‎commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/zip/ZipFileSystem.java‎

Lines changed: 60 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,6 @@
1616
*/
1717
package org.apache.commons.vfs2.provider.zip;
1818

19-
import java.io.File;
20-
import java.io.IOException;
21-
import java.nio.charset.Charset;
22-
import java.util.Collection;
23-
import java.util.Enumeration;
24-
import java.util.HashMap;
25-
import java.util.Map;
26-
import java.util.zip.ZipEntry;
27-
import java.util.zip.ZipFile;
28-
2919
import org.apache.commons.logging.Log;
3020
import org.apache.commons.logging.LogFactory;
3121
import org.apache.commons.vfs2.Capability;
@@ -39,6 +29,16 @@
3929
import org.apache.commons.vfs2.provider.AbstractFileSystem;
4030
import org.apache.commons.vfs2.provider.UriParser;
4131

32+
import java.io.File;
33+
import java.io.IOException;
34+
import java.nio.charset.Charset;
35+
import java.util.Collection;
36+
import java.util.Enumeration;
37+
import java.util.HashMap;
38+
import java.util.Map;
39+
import java.util.zip.ZipEntry;
40+
import java.util.zip.ZipFile;
41+
4242
/**
4343
* A read-only file system for ZIP and JAR files.
4444
*/
@@ -49,7 +49,53 @@ public class ZipFileSystem extends AbstractFileSystem {
4949

5050
private final File file;
5151
private final Charset charset;
52-
private ZipFile zipFile;
52+
private ZipFileThreadLocal zipFile = new ZipFileThreadLocal();
53+
54+
private class ZipFileThreadLocal {
55+
56+
private ThreadLocal<Boolean> isPresent = new ThreadLocal<Boolean>() {
57+
@Override
58+
protected Boolean initialValue() {
59+
return Boolean.FALSE;
60+
}
61+
};
62+
private ThreadLocal<ZipFile> zipFile = new ThreadLocal<ZipFile>() {
63+
@Override
64+
public ZipFile initialValue() {
65+
if (isPresent.get()) {
66+
throw new IllegalStateException("Creating an initial value but we already have one");
67+
}
68+
try {
69+
isPresent.set(Boolean.TRUE);
70+
return createZipFile(ZipFileSystem.this.file);
71+
} catch (FileSystemException fse) {
72+
throw new RuntimeException(fse);
73+
}
74+
}
75+
};
76+
77+
public ZipFile getFile() throws FileSystemException {
78+
try {
79+
return zipFile.get();
80+
} catch (RuntimeException e) {
81+
if (e.getCause() instanceof FileSystemException) {
82+
throw new FileSystemException(e.getCause());
83+
}
84+
else {
85+
throw new RuntimeException(e);
86+
}
87+
}
88+
}
89+
90+
public void closeFile() throws IOException {
91+
if (isPresent.get()) {
92+
ZipFile file = zipFile.get();
93+
file.close();
94+
zipFile.remove();
95+
isPresent.set(Boolean.FALSE);
96+
}
97+
}
98+
}
5399

54100
/**
55101
* Cache doesn't need to be synchronized since it is read-only.
@@ -71,12 +117,6 @@ public ZipFileSystem(final AbstractFileName rootFileName, final FileObject paren
71117
// Make a local copy of the file
72118
file = parentLayer.getFileSystem().replicateFile(parentLayer, Selectors.SELECT_SELF);
73119
this.charset = ZipFileSystemConfigBuilder.getInstance().getCharset(fileSystemOptions);
74-
75-
// Open the Zip file
76-
if (!file.exists()) {
77-
// Don't need to do anything
78-
zipFile = null;
79-
}
80120
}
81121

82122
/**
@@ -111,12 +151,9 @@ protected ZipFileObject createZipFileObject(final AbstractFileName name, final Z
111151

112152
@Override
113153
protected void doCloseCommunicationLink() {
114-
// Release the zip file
154+
// Release the zip files
115155
try {
116-
if (zipFile != null) {
117-
zipFile.close();
118-
zipFile = null;
119-
}
156+
zipFile.closeFile();
120157
} catch (final IOException e) {
121158
// getLogger().warn("vfs.provider.zip/close-zip-file.error :" + file, e);
122159
VfsLog.warn(getLogger(), LOG, "vfs.provider.zip/close-zip-file.error :" + file, e);
@@ -136,11 +173,7 @@ protected FileObject getFileFromCache(final FileName name) {
136173
}
137174

138175
protected ZipFile getZipFile() throws FileSystemException {
139-
if (zipFile == null && this.file.exists()) {
140-
this.zipFile = createZipFile(this.file);
141-
}
142-
143-
return zipFile;
176+
return zipFile.getFile();
144177
}
145178

146179
@Override

‎commons-vfs2/src/test/java/org/apache/commons/vfs2/ProviderTestSuite.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@ protected ProviderTestSuite(final ProviderTestConfig providerConfig, final Strin
4747
*/
4848
@Override
4949
protected void addBaseTests() throws Exception {
50-
addTests(UrlTests.class);
51-
addTests(ProviderCacheStrategyTests.class);
52-
addTests(UriTests.class);
53-
addTests(NamingTests.class);
54-
addTests(ContentTests.class);
55-
addTests(ProviderReadTests.class);
56-
addTests(ProviderWriteTests.class);
57-
addTests(ProviderWriteAppendTests.class);
58-
addTests(ProviderRandomReadTests.class);
59-
addTests(ProviderRandomReadWriteTests.class);
60-
addTests(ProviderRandomSetLengthTests.class);
61-
addTests(ProviderRenameTests.class);
62-
addTests(ProviderDeleteTests.class);
63-
addTests(LastModifiedTests.class);
64-
addTests(UrlStructureTests.class);
50+
// addTests(UrlTests.class);
51+
// addTests(ProviderCacheStrategyTests.class);
52+
// addTests(UriTests.class);
53+
// addTests(NamingTests.class);
54+
// addTests(ContentTests.class);
55+
// addTests(ProviderReadTests.class);
56+
// addTests(ProviderWriteTests.class);
57+
// addTests(ProviderWriteAppendTests.class);
58+
// addTests(ProviderRandomReadTests.class);
59+
// addTests(ProviderRandomReadWriteTests.class);
60+
// addTests(ProviderRandomSetLengthTests.class);
61+
// addTests(ProviderRenameTests.class);
62+
// addTests(ProviderDeleteTests.class);
63+
// addTests(LastModifiedTests.class);
64+
// addTests(UrlStructureTests.class);
6565
addTests(VfsClassLoaderTests.class);
6666
}
6767

0 commit comments

Comments
 (0)