You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2007/09/24 16:39:51 UTC
svn commit: r578838 -
/myfaces/core/branches/1_2_1/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java
Author: mmarinschek
Date: Mon Sep 24 07:39:50 2007
New Revision: 578838
URL: http://svn.apache.org/viewvc?rev=578838&view=rev
Log:
https://issues.apache.org/jira/browse/MYFACES-1732 (MYFACES-1732): New error-handling doesn't deal with Exceptions in validation method
Modified:
myfaces/core/branches/1_2_1/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java
Modified: myfaces/core/branches/1_2_1/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1_2_1/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java?rev=578838&r1=578837&r2=578838&view=diff
==============================================================================
--- myfaces/core/branches/1_2_1/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java (original)
+++ myfaces/core/branches/1_2_1/api/src/main/java-templates/javax/faces/component/UIInputTemplate.java Mon Sep 24 07:39:50 2007
@@ -262,24 +262,33 @@
public void validate(FacesContext context)
{
if (context == null) throw new NullPointerException("context");
- Object submittedValue = getSubmittedValue();
- if (submittedValue == null) return;
+
+ try {
- Object convertedValue = getConvertedValue(context, submittedValue);
+ Object submittedValue = getSubmittedValue();
+ if (submittedValue == null) return;
- if (!isValid()) return;
+ Object convertedValue = getConvertedValue(context, submittedValue);
- validateValue(context, convertedValue);
+ if (!isValid()) return;
- if (!isValid()) return;
+ validateValue(context, convertedValue);
- Object previousValue = getValue();
- setValue(convertedValue);
- setSubmittedValue(null);
- if (compareValues(previousValue, convertedValue))
+ if (!isValid()) return;
+
+ Object previousValue = getValue();
+ setValue(convertedValue);
+ setSubmittedValue(null);
+ if (compareValues(previousValue, convertedValue))
+ {
+ queueEvent(new ValueChangeEvent(this, previousValue, convertedValue));
+ }
+ }
+ catch (Exception ex)
{
- queueEvent(new ValueChangeEvent(this, previousValue, convertedValue));
+ throw new FacesException("Exception while validating component with path : "+_ComponentUtils.getPathToComponent(this),ex);
}
+
}
/**