Skip to content

Commit ecd4ef2

Browse files
authored
code around ARU changes in bugs that are cancelled (#399)
* code around ARU changes in bugs that are cancelled, download URL is deleted from metadata
1 parent 2dbdc40 commit ecd4ef2

File tree

1 file changed

+14
-12
lines changed
  • imagetool/src/main/java/com/oracle/weblogic/imagetool/aru

1 file changed

+14
-12
lines changed

imagetool/src/main/java/com/oracle/weblogic/imagetool/aru/AruPatch.java

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -198,19 +198,21 @@ public static List<AruPatch> getPatches(Document patchList, String patchSelector
198198

199199
int index = patch.downloadPath().indexOf("patch_file=");
200200
if (index < 0) {
201-
throw new XPathExpressionException(Utils.getMessage("IMG-0059", patch.patchId()));
201+
logger.fine("Unusable patch data from ARU for id:" + patch.patchId()
202+
+ " ver:" + patch.version() + " url:" + patch.downloadUrl());
203+
} else {
204+
patch.fileName(patch.downloadPath().substring(index + "patch_file=".length()));
205+
206+
logger.fine("AruPatch created id:" + patch.patchId()
207+
+ " ver:" + patch.version()
208+
+ " desc:" + patch.description()
209+
+ " rel:" + patch.release()
210+
+ " product:" + patch.product()
211+
+ " relName:" + patch.releaseName()
212+
+ " psu:" + patch.psuBundle()
213+
+ " url:" + patch.downloadUrl());
214+
result.add(patch);
202215
}
203-
patch.fileName(patch.downloadPath().substring(index + "patch_file=".length()));
204-
205-
logger.fine("AruPatch created id:" + patch.patchId()
206-
+ " ver:" + patch.version()
207-
+ " desc:" + patch.description()
208-
+ " rel:" + patch.release()
209-
+ " product:" + patch.product()
210-
+ " relName:" + patch.releaseName()
211-
+ " psu:" + patch.psuBundle()
212-
+ " url:" + patch.downloadUrl());
213-
result.add(patch);
214216
}
215217
}
216218
return result;

0 commit comments

Comments
 (0)