Author: markt
Date: Fri May 22 15:14:45 2009
New Revision: 777567
URL: http://svn.apache.org/viewvc?rev=777567&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46967
Better handling of errors when trying to use Manager.randomFile
Based on a patch by Kirk Wolf
Also make behaviour consistent when using 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/session/ManagerBase.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 22 15:14:45 2009
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,673796,673820,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,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=777567&r1=777566&r2=777567&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May 22 15:14:45 2009
@@ -81,14 +81,6 @@
but could agree to some of it if it was split into parts
-1: remm: no for TC 6.0
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46967
- Better handling of errors when trying to use Manager.randomFile
- Based on a patch by Kirk Wolf
- Also make behaviour consistent when using a security manager
- http://svn.apache.org/viewvc?rev=763228&view=rev
- +1: markt, rjung, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46985
Clean up timeout handling
http://svn.apache.org/viewvc?rev=763262&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=777567&r1=777566&r2=777567&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/ManagerBase.java Fri
May 22 15:14:45 2009
@@ -220,9 +220,14 @@
// ------------------------------------------------------------- Security
classes
- private class PrivilegedSetRandomFile implements PrivilegedAction{
+ private class PrivilegedSetRandomFile
+ implements PrivilegedAction<DataInputStream>{
- public Object run(){
+ public PrivilegedSetRandomFile(String s) {
+ devRandomSource = s;
+ }
+
+ public DataInputStream run(){
try {
File f=new File( devRandomSource );
if( ! f.exists() ) return null;
@@ -232,6 +237,16 @@
log.debug( "Opening " + devRandomSource );
return randomIS;
} catch (IOException ex){
+ log.warn("Error reading " + devRandomSource, ex);
+ if (randomIS != null) {
+ try {
+ randomIS.close();
+ } catch (Exception e) {
+ log.warn("Failed to close randomIS.");
+ }
+ }
+ devRandomSource = null;
+ randomIS=null;
return null;
}
}
@@ -504,10 +519,10 @@
* - so use it if available.
*/
public void setRandomFile( String s ) {
- // as a hack, you can use a static file - and genarate the same
+ // as a hack, you can use a static file - and generate the same
// session ids ( good for strange debugging )
if (Globals.IS_SECURITY_ENABLED){
- randomIS = (DataInputStream)AccessController.doPrivileged(new
PrivilegedSetRandomFile());
+ randomIS = AccessController.doPrivileged(new
PrivilegedSetRandomFile(s));
} else {
try{
devRandomSource=s;
@@ -518,12 +533,15 @@
if( log.isDebugEnabled() )
log.debug( "Opening " + devRandomSource );
} catch( IOException ex ) {
- try {
- randomIS.close();
- } catch (Exception e) {
- log.warn("Failed to close randomIS.");
+ log.warn("Error reading " + devRandomSource, ex);
+ if (randomIS != null) {
+ try {
+ randomIS.close();
+ } catch (Exception e) {
+ log.warn("Failed to close randomIS.");
+ }
}
-
+ devRandomSource = null;
randomIS=null;
}
}
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=777567&r1=777566&r2=777567&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri May 22 15:14:45 2009
@@ -43,6 +43,10 @@
<bug>46908</bug>: Try and support java encoding names when using an xml
parser provided via the endorsed mechanism. (markt)
</fix>
+ <fix>
+ <bug>46967</bug>: Better handling of errors when trying to use
+ Manager.randomFile. Based on a patch by Kirk Wolf. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
