Browse Source

make sure the entry has been read when looking for uid/gid and so on

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@806035 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 16 years ago
parent
commit
3ba5435efb
3 changed files with 9 additions and 1 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/types/resources/ArchiveResource.java
  2. +4
    -0
      src/main/org/apache/tools/ant/types/resources/TarResource.java
  3. +4
    -0
      src/main/org/apache/tools/ant/types/resources/ZipResource.java

+ 1
- 1
src/main/org/apache/tools/ant/types/resources/ArchiveResource.java View File

@@ -242,7 +242,7 @@ public abstract class ArchiveResource extends Resource {
: getArchive().toString() + ':' + getName();
}

private synchronized void checkEntry() throws BuildException {
protected final synchronized void checkEntry() throws BuildException {
dieOnCircularReference();
if (haveEntry) {
return;


+ 4
- 0
src/main/org/apache/tools/ant/types/resources/TarResource.java View File

@@ -115,6 +115,7 @@ public class TarResource extends ArchiveResource {
if (isReference()) {
return ((TarResource) getCheckedRef()).getUserName();
}
checkEntry();
return userName;
}

@@ -125,6 +126,7 @@ public class TarResource extends ArchiveResource {
if (isReference()) {
return ((TarResource) getCheckedRef()).getGroup();
}
checkEntry();
return groupName;
}

@@ -135,6 +137,7 @@ public class TarResource extends ArchiveResource {
if (isReference()) {
return ((TarResource) getCheckedRef()).getUid();
}
checkEntry();
return uid;
}

@@ -145,6 +148,7 @@ public class TarResource extends ArchiveResource {
if (isReference()) {
return ((TarResource) getCheckedRef()).getGid();
}
checkEntry();
return uid;
}



+ 4
- 0
src/main/org/apache/tools/ant/types/resources/ZipResource.java View File

@@ -173,6 +173,10 @@ public class ZipResource extends ArchiveResource {
* @since Ant 1.8.0
*/
public ZipExtraField[] getExtraFields() {
if (isReference()) {
return ((ZipResource) getCheckedRef()).getExtraFields();
}
checkEntry();
if (extras == null) {
return new ZipExtraField[0];
}


Loading…
Cancel
Save