Author: markt
Date: Sun Sep 20 22:29:17 2009
New Revision: 817115
URL: http://svn.apache.org/viewvc?rev=817115&view=rev
Log:
Make the JDBC leak prevention code work with a security manager
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 20 22:29:17 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77
7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,805153,809603,812125,812137,814180
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,677910,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,753039,757335,757774,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,770809,770876,776921,776924,776935,776945,77
7464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,805153,809603,812125,812137,812432,814180
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=817115&r1=817114&r2=817115&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Sep 20 22:29:17 2009
@@ -250,11 +250,6 @@
+ If you have multiple instances of Tomcat, each with a separate
+ <code>$CATALINA_HOME</code> but a shared
<code>$CATALINA_BASE</code> then
-* Make the JDBC leak prevention code work with a security manager
- http://svn.apache.org/viewvc?rev=812432&view=rev
- +1: markt, rjung, jim
- -1:
-
* Add additional permission required by JULI
http://svn.apache.org/viewvc?rev=813001&view=rev
+1: markt, rjung
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java?rev=817115&r1=817114&r2=817115&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/JdbcLeakPrevention.java
Sun Sep 20 22:29:17 2009
@@ -23,41 +23,26 @@
import java.sql.SQLException;
import java.util.Enumeration;
-import org.apache.catalina.util.StringManager;
-
/**
- * This class is loaded by the {...@link WebappClassLoader} to enable it to
+ * This class is loaded by the {...@link WebappClassLoader} to enable it to
* deregister JDBC drivers forgotten by the web application. There are some
* classloading hacks involved - see {...@link
WebappClassLoader#clearReferences()}
* for details - but the short version is do not just create a new instance of
* this class with the new keyword.
+ *
+ * Since this class is loaded by {...@link WebappClassLoader}, it can not
refer to
+ * any internal Tomcat classes as that will cause the security manager to
+ * complain.
*/
public class JdbcLeakPrevention {
- /**
- * The logger for this class.
- */
- protected static org.apache.juli.logging.Log log=
- org.apache.juli.logging.LogFactory.getLog( JdbcLeakPrevention.class );
-
- /**
- * The string manager for this package.
- */
- protected static final StringManager sm =
- StringManager.getManager(Constants.Package);
-
- public void clearJdbcDriverRegistrations() {
+ public void clearJdbcDriverRegistrations() throws SQLException {
// Unregister any JDBC drivers loaded by the class loader that loaded
// this class - ie the webapp class loader
Enumeration<Driver> drivers = DriverManager.getDrivers();
while (drivers.hasMoreElements()) {
Driver driver = drivers.nextElement();
- try {
- DriverManager.deregisterDriver(driver);
- } catch (SQLException sqle) {
- log.warn(sm.getString("jdbcLeakPrevention.jdbcRemoveFailed",
- driver.toString()), sqle);
- }
+ DriverManager.deregisterDriver(driver);
}
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=817115&r1=817114&r2=817115&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
Sun Sep 20 22:29:17 2009
@@ -1619,16 +1619,22 @@
*/
InputStream is = getResourceAsStream(
"org/apache/catalina/loader/JdbcLeakPrevention.class");
- // Cheat - we know roughly how big the class will be (~1K) but allow
- // plenty room to grow
- byte[] classBytes = new byte[4096];
+ // We know roughly how big the class will be (~ 1K) so allow 2k as a
+ // starting point
+ byte[] classBytes = new byte[2048];
int offset = 0;
- try {
- int read = is.read(classBytes, offset, 4096-offset);
+ try {
+ int read = is.read(classBytes, offset, classBytes.length-offset);
while (read > -1) {
offset += read;
- read = is.read(classBytes, offset, 4096-offset);
+ if (offset == classBytes.length) {
+ // Buffer full - double size
+ byte[] tmp = new byte[classBytes.length * 2];
+ System.arraycopy(classBytes, 0, tmp, 0, classBytes.length);
+ classBytes = tmp;
}
+ read = is.read(classBytes, offset, classBytes.length-offset);
+ }
Class<?> lpClass =
defineClass("org.apache.catalina.loader.JdbcLeakPrevention",
classBytes, 0, offset);
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=817115&r1=817114&r2=817115&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Sep 20 22:29:17 2009
@@ -162,6 +162,10 @@
Correct JDBC driver de-registration on web application stop and fix NPE
that is exposed by the fix. (markt)
</fix>
+ <fix>
+ Ensure JDBC driver de-registration works with a security manager.
+ (markt)
+ </fix>
<update>
Various JNDI realm improvements for Active Directory. These include the
ability to specify a default role, optional handling for nested roles
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
