Author: markt
Date: Fri Aug 12 08:21:32 2011
New Revision: 1157004
URL: http://svn.apache.org/viewvc?rev=1157004&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51473
Fix concatenation of values in SecurityConfig.setSecurityProperty() when the
value provided by JRE is null.
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityConfig.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1157004&r1=1157003&r2=1157004&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Aug 12 08:21:32 2011
@@ -102,13 +102,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51473
- Fix concatenation of values in SecurityConfig.setSecurityProperty()
- when the value provided by JRE is null.
- http://svn.apache.org/viewvc?rev=1142904&view=rev
- +1: kkolinko, markt, kfujino
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51324
Improve handling of exceptions when flushing the response buffer to
ensure that the doFlush flag does not get stuck in the enabled state.
Modified:
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityConfig.java?rev=1157004&r1=1157003&r2=1157004&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityConfig.java
(original)
+++
tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/security/SecurityConfig.java
Fri Aug 12 08:21:32 2011
@@ -38,6 +38,8 @@ public final class SecurityConfig{
+ ",org.apache.coyote."
+ ",org.apache.tomcat.";
+ // FIX ME package "javax." was removed to prevent HotSpot
+ // fatal internal errors
private final static String PACKAGE_DEFINITION= "java.,sun."
+ ",org.apache.catalina."
+ ",org.apache.coyote."
@@ -116,13 +118,14 @@ public final class SecurityConfig{
if (System.getSecurityManager() != null){
String definition = Security.getProperty(properties);
if( definition != null && definition.length() > 0 ){
- definition += ",";
+ if (packageList.length() > 0) {
+ definition = definition + ',' + packageList;
+ }
+ } else {
+ definition = packageList;
}
- Security.setProperty(properties,
- // FIX ME package "javax." was removed to prevent HotSpot
- // fatal internal errors
- definition + packageList);
+ Security.setProperty(properties, definition);
}
}
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1157004&r1=1157003&r2=1157004&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Aug 12
08:21:32 2011
@@ -64,6 +64,11 @@
<bug>51403</bug>: Avoid NullPointerException in JULI FileHandler if
formatter is misconfigured. (kkolinko)
</fix>
+ <fix>
+ <bug>51473</bug>: Fix concatenation of values in
+ SecurityConfig.setSecurityProperty() when the value provided by JRE is
+ null. (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
