dev@javaserverfaces.java.net

Review: Part II of JSFRI135 and roll back JSFRI139

From: Jayashri Visvanathan <Jayashri.Visvanathan_at_Sun.COM>
Date: Mon, 11 Jul 2005 18:55:14 -0700

M src/com/sun/faces/lifecycle/LifecycleImpl.java
  This should have been part of fix for issue 135 that I overlooked.
 Rethrow exception from phase.execute() as FacesException.
 As per javadocs, any exception thrown during the execution different
 lifecycle phases should be rethrown.

M src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java
  Unless the converter returns something like "empty", its not useful
 to go through the converter if the value is null. For input
 components, this results in 'value=""' being rendered which is redundant.
 So I am rolling back my change unless we decide to change the converter
 as requested in the issue.

Sorry, I commited the above changes already. My checkin this morning
broke a few systests. The above changes were needed to fix the tests I
ran the tests against the wrong workspace. I forgot what workspace I was
using after the long break :-[ . I'd still like someone to review
the change bundle.

Thanks
-Jayashri


Index: src/com/sun/faces/lifecycle/LifecycleImpl.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/lifecycle/LifecycleImpl.java,v
retrieving revision 1.51
diff -u -r1.51 LifecycleImpl.java
--- src/com/sun/faces/lifecycle/LifecycleImpl.java 11 Jul 2005 17:43:48 -0000 1.51
+++ src/com/sun/faces/lifecycle/LifecycleImpl.java 12 Jul 2005 01:28:30 -0000
@@ -248,6 +248,7 @@
                 logger.log(Level.WARNING, "executePhase(" + phaseId.toString() + ","
                         + context + ") threw exception", e);
             }
+ throw new FacesException(e);
         }
         
         try {
Index: src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java
===================================================================
RCS file: /cvs/javaserverfaces-sources/jsf-ri/src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java,v
retrieving revision 1.96
diff -u -r1.96 HtmlBasicRenderer.java
--- src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java 11 Jul 2005 17:43:49 -0000 1.96
+++ src/com/sun/faces/renderkit/html_basic/HtmlBasicRenderer.java 12 Jul 2005 01:28:30 -0000
@@ -256,7 +256,9 @@
 
         String currentValue = null;
         Object currentObj = getValue(component);
- currentValue = getFormattedValue(context, component, currentObj);
+ if (currentObj != null) {
+ currentValue = getFormattedValue(context, component, currentObj);
+ }
         return currentValue;
     }