tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1142904 - in /tomcat/trunk: java/org/apache/catalina/security/SecurityConfig.java webapps/docs/changelog.xml
Date Tue, 05 Jul 2011 07:10:32 GMT
Author: kkolinko
Date: Tue Jul  5 07:10:31 2011
New Revision: 1142904

URL: http://svn.apache.org/viewvc?rev=1142904&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/trunk/java/org/apache/catalina/security/SecurityConfig.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java?rev=1142904&r1=1142903&r2=1142904&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java Tue Jul  5 07:10:31
2011
@@ -39,6 +39,8 @@ public final class SecurityConfig{
                                                 + ",org.apache.coyote."
                                                 + ",org.apache.tomcat.";
     
+    // FIX ME package "javax." was removed to prevent HotSpot
+    // fatal internal errors
     private static final String PACKAGE_DEFINITION= "java.,sun."
                                                 + ",org.apache.catalina." 
                                                 + ",org.apache.coyote."
@@ -117,13 +119,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/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1142904&r1=1142903&r2=1142904&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul  5 07:10:31 2011
@@ -70,6 +70,10 @@
         listeners and filters are stopped in a separate thread rather than the
         current thread. Patch provided by Felix Schumacher. (markt)  
       </fix>
+      <fix>
+        <bug>51473</bug>: Fix concatenation of values in
+        <code>SecurityConfig.setSecurityProperty()</code>. (kkolinko)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">
@@ -89,7 +93,7 @@
     </changelog>
   </subsection>
 </section>
-<section name="Tomcat 7.0.17 (markt)" rtext="released TBD">
+<section name="Tomcat 7.0.17 (markt)" rtext="not released">
   <subsection name="Catalina">
     <changelog>
       <add>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message