From e3b213cc4eb762d9c10ab80a052785d3d73dd597 Mon Sep 17 00:00:00 2001 From: shuyangzhou Date: Mon, 30 Sep 2024 18:53:14 -0700 Subject: [PATCH] LPD-37806 Patch to remove the extra release call to match tomcat jasper's behavior, this is needed to work with tomcat jsp api rather than the out of date glassfish jsp api. --- .../patches/10-LPD-37806.patch | 20 +++++++++++++++++++ .../jasper/compiler/TagLibraryInfoImpl.java | 7 ++----- 2 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 modules/third-party/javax-servlet-jsp/patches/10-LPD-37806.patch diff --git a/modules/third-party/javax-servlet-jsp/patches/10-LPD-37806.patch b/modules/third-party/javax-servlet-jsp/patches/10-LPD-37806.patch new file mode 100644 index 0000000000000..ce174625c6290 --- /dev/null +++ b/modules/third-party/javax-servlet-jsp/patches/10-LPD-37806.patch @@ -0,0 +1,20 @@ +diff --git a/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/org/apache/jasper/compiler/TagLibraryInfoImpl.java +index dba5becd0cf5e..e933930c88f56 100644 +--- a/org/apache/jasper/compiler/TagLibraryInfoImpl.java ++++ b/org/apache/jasper/compiler/TagLibraryInfoImpl.java +@@ -954,12 +954,9 @@ public class TagLibraryInfoImpl extends TagLibraryInfo implements TagConstants { + uri = URN_JSPTLD + uri; + } + +- ValidationMessage[] messages = tlv.validate(getPrefixString(), uri, +- thePage); +- tlv.release(); +- +- return messages; ++ return tlv.validate(getPrefixString(), uri, thePage); + } + + protected TagLibraryValidator tagLibraryValidator; + } ++/* @generated */ +\ No newline at end of file diff --git a/modules/third-party/javax-servlet-jsp/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java b/modules/third-party/javax-servlet-jsp/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java index dba5becd0cf5e..e933930c88f56 100644 --- a/modules/third-party/javax-servlet-jsp/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java +++ b/modules/third-party/javax-servlet-jsp/src/main/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java @@ -954,12 +954,9 @@ public ValidationMessage[] validate(PageData thePage) { uri = URN_JSPTLD + uri; } - ValidationMessage[] messages = tlv.validate(getPrefixString(), uri, - thePage); - tlv.release(); - - return messages; + return tlv.validate(getPrefixString(), uri, thePage); } protected TagLibraryValidator tagLibraryValidator; } +/* @generated */ \ No newline at end of file