Revert clean-up. definePackage always needs to be called.
diff --git a/java/org/apache/catalina/loader/WebappClassLoaderBase.java b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
index 0d2bb7c..288d26e 100644
--- a/java/org/apache/catalina/loader/WebappClassLoaderBase.java
+++ b/java/org/apache/catalina/loader/WebappClassLoaderBase.java
@@ -2430,40 +2430,46 @@
}
}
- if (securityManager != null) {
- // Looking up the package
- int pos = name.lastIndexOf('.');
- if (pos != -1) {
- String packageName = name.substring(0, pos);
- Package pkg = getPackage(packageName);
+ // Looking up the package
+ String packageName = null;
+ int pos = name.lastIndexOf('.');
+ if (pos != -1) {
+ packageName = name.substring(0, pos);
+ }
- // Define the package (if null)
- if (pkg == null) {
- try {
- if (manifest == null) {
- definePackage(packageName, null, null, null, null, null, null, null);
- } else {
- definePackage(packageName, manifest, codeBase);
- }
- } catch (IllegalArgumentException e) {
- // Ignore: normal error due to dual definition of package
- }
- pkg = getPackage(packageName);
- }
+ Package pkg = null;
- // Checking sealing
- if (pkg != null) {
- boolean sealCheck = true;
- if (pkg.isSealed()) {
- sealCheck = pkg.isSealed(codeBase);
+ if (packageName != null) {
+ pkg = getPackage(packageName);
+
+ // Define the package (if null)
+ if (pkg == null) {
+ try {
+ if (manifest == null) {
+ definePackage(packageName, null, null, null, null, null, null, null);
} else {
- sealCheck = (manifest == null) || !isPackageSealed(packageName, manifest);
+ definePackage(packageName, manifest, codeBase);
}
- if (!sealCheck) {
- throw new SecurityException
- ("Sealing violation loading " + name + " : Package "
- + packageName + " is sealed.");
- }
+ } catch (IllegalArgumentException e) {
+ // Ignore: normal error due to dual definition of package
+ }
+ pkg = getPackage(packageName);
+ }
+ }
+
+ if (securityManager != null) {
+ // Checking sealing
+ if (pkg != null) {
+ boolean sealCheck = true;
+ if (pkg.isSealed()) {
+ sealCheck = pkg.isSealed(codeBase);
+ } else {
+ sealCheck = (manifest == null) || !isPackageSealed(packageName, manifest);
+ }
+ if (!sealCheck) {
+ throw new SecurityException
+ ("Sealing violation loading " + name + " : Package "
+ + packageName + " is sealed.");
}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3a3e3cd..b6a86b6 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -105,8 +105,16 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 9.0.52 (remm)" rtext="in development">
+ <subsection name="Catalina">
+ <changelog>
+ <scode>
+ Correct an error in some code clean-up that mean that web application
+ classes were not configured with the correct package. (markt)
+ </scode>
+ </changelog>
+ </subsection>
</section>
-<section name="Tomcat 9.0.51 (remm)" rtext="in progress">
+<section name="Tomcat 9.0.51 (remm)" rtext="not released">
<subsection name="Catalina">
<changelog>
<fix>
