Skip to content

Commit d55589f

Browse files
authored
Exclude zip directory entry from ATP wallet check (#405)
1 parent 45386e8 commit d55589f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

core/src/main/java/oracle/weblogic/deploy/util/WLSDeployArchive.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,7 @@ public String getATPWallet() throws WLSDeployArchiveIOException {
542542

543543
LOGGER.entering(CLASS, METHOD);
544544
List<String> result = getZipFile().listZipEntries(ARCHIVE_ATP_WALLET_PATH + ZIP_SEP);
545+
result.remove(ARCHIVE_ATP_WALLET_PATH + ZIP_SEP);
545546
LOGGER.exiting(CLASS, METHOD, result);
546547
if (result.size() > 0) {
547548
return result.get(0);

core/src/main/python/wlsdeploy/tool/create/atp_helper.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ def extract_walletzip(model, model_context, archive_file, atp_zipentry):
129129
extract_path = domain_path + os.sep + 'atpwallet'
130130
extract_dir = File(extract_path)
131131
extract_dir.mkdirs()
132-
wallet_zip = archive_file.extractFile(atp_zipentry, File(domain_path))
133-
FileUtils.extractZipFileContent(archive_file, wallet_zip, extract_path)
132+
FileUtils.extractZipFileContent(archive_file, atp_zipentry, extract_path)
134133
return extract_path
135134
# update the model to add the tns_admin

0 commit comments

Comments
 (0)