Skip to content

Commit 0158df6

Browse files
committed
Fix test failures resulting from removal of security manager
1 parent b5d5ab9 commit 0158df6

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

java/org/apache/catalina/loader/WebappClassLoaderBase.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,18 +1323,7 @@ protected void checkStateForResourceLoading(String resource) throws IllegalState
13231323
*/
13241324
@Override
13251325
protected PermissionCollection getPermissions(CodeSource codeSource) {
1326-
String codeUrl = codeSource.getLocation().toString();
1327-
PermissionCollection pc;
1328-
if ((pc = loaderPC.get(codeUrl)) == null) {
1329-
pc = super.getPermissions(codeSource);
1330-
if (pc != null) {
1331-
for (Permission p : permissionList) {
1332-
pc.add(p);
1333-
}
1334-
loaderPC.put(codeUrl,pc);
1335-
}
1336-
}
1337-
return pc;
1326+
return null;
13381327
}
13391328

13401329

0 commit comments

Comments
 (0)