From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 26 Mar 2009 14:28:11 +0000 (+0000)
Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46915
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=92d008e313f75130989bd618976e7ef92ecdac3e;p=tomcat7.0

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46915
When resolving ResourceBundle properties, don't claim to have resolved the property unless we really have resolved it.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@758664 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/javax/el/ResourceBundleELResolver.java b/java/javax/el/ResourceBundleELResolver.java
index b7c5eea3a..733aec959 100644
--- a/java/javax/el/ResourceBundleELResolver.java
+++ b/java/javax/el/ResourceBundleELResolver.java
@@ -38,12 +38,12 @@ public class ResourceBundleELResolver extends ELResolver {
 		}
 		
 		if (base instanceof ResourceBundle) {
-			context.setPropertyResolved(true);
-
 			if (property != null) {
 				try {
-					return ((ResourceBundle) base).getObject(property
+				    Object result = ((ResourceBundle) base).getObject(property
 							.toString());
+		            context.setPropertyResolved(true);
+				    return result;
 				} catch (MissingResourceException mre) {
 					return "???" + property.toString() + "???";
 				}