Author: gvanmatre
Date: Sun Mar 12 16:46:13 2006
New Revision: 385396
URL: http://svn.apache.org/viewcvs?rev=385396&view=rev
Log:
Bug fix for 38784 reported by Christopher Hlubek and example provided by
Richard Wallace.
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePropertyResolver.java
Modified:
struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePropertyResolver.java
URL:
http://svn.apache.org/viewcvs/struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePropertyResolver.java?rev=385396&r1=385395&r2=385396&view=diff
==============================================================================
---
struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePropertyResolver.java
(original)
+++
struts/shale/trunk/core-library/src/java/org/apache/shale/faces/ShalePropertyResolver.java
Sun Mar 12 16:46:13 2006
@@ -126,7 +126,7 @@
} catch (NamingException e) {
throw new EvaluationException(e);
}
- } else if (base instanceof LoadBundle) {
+ } else if (base instanceof LoadBundle && !"basename".equals(property))
{
Map map = ((LoadBundle) base).getMap();
if ("map".equals(property)) {
return map;
@@ -171,7 +171,7 @@
} catch (NamingException e) {
throw new EvaluationException(e);
}
- } else if (base instanceof LoadBundle) {
+ } else if (base instanceof LoadBundle && !"basename".equals(property))
{
throw new PropertyNotFoundException("" + value);
} else {
original.setValue(base, property, value);
@@ -203,7 +203,7 @@
// Mimic standard JSF/JSP behavior when base is a Map
// by returning false if we cannot tell any better
return false;
- } else if (base instanceof LoadBundle) {
+ } else if (base instanceof LoadBundle && !"basename".equals(property))
{
// All properties of this object are considered read only
return true;
} else {
@@ -253,7 +253,7 @@
} else {
return value.getClass();
}
- } else if (base instanceof LoadBundle) {
+ } else if (base instanceof LoadBundle && !"basename".equals(property))
{
LoadBundle lb = (LoadBundle) base;
if ("map".equals(property)) {
return Map.class;
@@ -266,7 +266,7 @@
} else {
return null;
}
- }
+ }
} else {
return original.getType(base, property);
@@ -290,7 +290,7 @@
if (base instanceof Context) {
return getValue(base, "" + index);
- } else if (base instanceof LoadBundle) {
+ } else if (base instanceof LoadBundle && !"basename".equals(base)) {
return getValue(base, "" + index);
} else {
return original.getValue(base, index);
@@ -315,7 +315,7 @@
if (base instanceof Context) {
setValue(base, "" + index, value);
- } else if (base instanceof LoadBundle) {
+ } else if (base instanceof LoadBundle ) {
setValue(base, "" + index, value);
} else {
original.setValue(base, index, value);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
