infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-13 17:33:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

7017840: (zipfs) test/demo/zipfs/basic.sh needs to be updated due to 7013420

Browse Source 
Updated try-with-resourcse usage in test/demo code

Reviewed-by: alanb
This commit is contained in:
Xueming Shen 2011-02-08 13:30:30 -08:00
parent aa6f495fbe
commit 50ef3f8522
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdk/src/share/demo/nio/zipfs/Demo.java
View File

@ -156,7 +156,6 @@ public class Demo {
if (action == Action.create)
env.put("create", "true");
try (FileSystem fs = provider.newFileSystem(Paths.get(args[1]), env)) {
FileSystem fs2;
Path path, src, dst;
boolean isRename = false;
switch (action) {
@ -201,12 +200,12 @@ public class Demo {
Files.copy(src, dst, COPY_ATTRIBUTES);
break;
case zzmove:
try (fs2 = provider.newFileSystem(Paths.get(args[2]), env)) {
try (FileSystem fs2 = provider.newFileSystem(Paths.get(args[2]), env)) {
z2zmove(fs, fs2, args[3]);
}
break;
case zzcopy:
try (fs2 = provider.newFileSystem(Paths.get(args[2]), env)) {
try (FileSystem fs2 = provider.newFileSystem(Paths.get(args[2]), env)) {
z2zcopy(fs, fs2, args[3]);
}
break;

10
jdk/test/demo/zipfs/ZipFSTester.java
View File

@ -72,7 +72,7 @@ public class ZipFSTester {
}
}
static void test1(FileSystem fs)
static void test1(FileSystem fs0)
throws Exception
{
Random rdm = new Random();
@ -80,11 +80,11 @@ public class ZipFSTester {
Path tmpfsPath = getTempPath();
Map<String, Object> env = new HashMap<String, Object>();
env.put("create", "true");
FileSystem fs0 = newZipFileSystem(tmpfsPath, env);
z2zcopy(fs, fs0, "/", 0);
fs0.close(); // sync to file
try (FileSystem copy = newZipFileSystem(tmpfsPath, env)) {
z2zcopy(fs0, copy, "/", 0);
}
try (fs = newZipFileSystem(tmpfsPath, new HashMap<String, Object>())) {
try (FileSystem fs = newZipFileSystem(tmpfsPath, new HashMap<String, Object>())) {
FileSystemProvider provider = fs.provider();
// newFileSystem(path...) should not throw exception

2
jdk/test/demo/zipfs/basic.sh
View File

@ -21,7 +21,7 @@
# questions.
#
# @test
# @bug 6990846 7009092 7009085 7015391 7014948 7005986
# @bug 6990846 7009092 7009085 7015391 7014948 7005986 7017840
# @summary Test ZipFileSystem demo
# @build Basic PathOps ZipFSTester
# @run shell basic.sh