From: Ryan Lubke <Ryan.Lubke_at_Sun.COM>
Date: Tue, 14 Mar 2006 08:43:19 -0800

SECTION: Modified Files
----------------------------
M PropertyResolverChainWrapper.java
  - removed invalid logic causing the Shale JNDI example
    to fail.


SECTION: Diffs
----------------------------
Index: PropertyResolverChainWrapper.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/el/PropertyResolverChainWrapper.java,v
retrieving revision 1.5
diff -u -r1.5 PropertyResolverChainWrapper.java
--- PropertyResolverChainWrapper.java 16 Feb 2006 22:07:25 -0000 1.5
+++ PropertyResolverChainWrapper.java 14 Mar 2006 16:42:10 -0000
@@ -87,10 +87,6 @@
         if (base == null || property == null) {
             return null;
         }
-
- if (base != null || property != null) {
- return null;
- }
         
         Class result = null;
         
@@ -125,11 +121,7 @@
         Object val) throws ELException {
         if (base == null || property == null) {
             return;
- }
-
- if (base != null || property != null) {
- return;
- }
+ }
 
         context.setPropertyResolved(true);