Author: markt
Date: Thu Nov 11 13:00:52 2010
New Revision: 1033925
URL: http://svn.apache.org/viewvc?rev=1033925&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50252
Prevent ClassCastException when using a <ResourceLink>.
Patch provided by Eiji Takahashi.
Modified:
tomcat/trunk/java/org/apache/naming/NamingContext.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=1033925&r1=1033924&r2=1033925&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Thu Nov 11 13:00:52
2010
@@ -825,12 +825,14 @@ public class NamingContext implements Co
try {
Object obj = NamingManager.getObjectInstance
(entry.value, name, this, env);
- boolean singleton = Boolean.parseBoolean(
- (String) ((ResourceRef) entry.value).get(
- "singleton").getContent());
- if (singleton) {
- entry.type = NamingEntry.ENTRY;
- entry.value = obj;
+ if(entry.value instanceof ResourceRef) {
+ boolean singleton = Boolean.parseBoolean(
+ (String) ((ResourceRef) entry.value).get(
+ "singleton").getContent());
+ if (singleton) {
+ entry.type = NamingEntry.ENTRY;
+ entry.value = obj;
+ }
}
return obj;
} catch (NamingException e) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1033925&r1=1033924&r2=1033925&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 11 13:00:52 2010
@@ -132,6 +132,10 @@
PersistentManager and associated code clean-up. Patch provided by
Tiago Batista. (markt)
</fix>
+ <fix>
+ <bug>50252</bug>: Prevent ClassCastException when using a
+ <ResourceLink>. Patch provided by Eiji Takahashi. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
