You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by wt...@apache.org on 2016/06/22 16:31:00 UTC

svn commit: r1749736 - in /myfaces/core/branches/2.1.x: api/src/main/java/javax/faces/component/_ComponentUtils.java impl/src/main/java/org/apache/myfaces/view/facelets/compiler/_ComponentUtils.java

Author: wtlucy
Date: Wed Jun 22 16:31:00 2016
New Revision: 1749736

URL: http://svn.apache.org/viewvc?rev=1749736&view=rev
Log:
MYFACES-4051 FacesMessage.Severity always set to ERROR after ValidatorException

Modified:
    myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/_ComponentUtils.java
    myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/_ComponentUtils.java

Modified: myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/_ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/_ComponentUtils.java?rev=1749736&r1=1749735&r2=1749736&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/_ComponentUtils.java (original)
+++ myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/_ComponentUtils.java Wed Jun 22 16:31:00 2016
@@ -286,7 +286,6 @@ class _ComponentUtils
                     FacesMessage facesMessage = e.getFacesMessage();
                     if (facesMessage != null)
                     {
-                        facesMessage.setSeverity(FacesMessage.SEVERITY_ERROR);
                         context.addMessage(input.getClientId(context), facesMessage);
                     }
                     Collection<FacesMessage> facesMessages = e.getFacesMessages();
@@ -294,7 +293,6 @@ class _ComponentUtils
                     {
                         for (FacesMessage message : facesMessages)
                         {
-                            message.setSeverity(FacesMessage.SEVERITY_ERROR);
                             context.addMessage(input.getClientId(context), message);
                         }
                     }
@@ -328,7 +326,6 @@ class _ComponentUtils
                         FacesMessage facesMessage = ((ValidatorException)cause).getFacesMessage();
                         if (facesMessage != null)
                         {
-                            facesMessage.setSeverity(FacesMessage.SEVERITY_ERROR);
                             context.addMessage(input.getClientId(context), facesMessage);
                         }
                         Collection<FacesMessage> facesMessages = ((ValidatorException)cause).getFacesMessages();
@@ -336,7 +333,6 @@ class _ComponentUtils
                         {
                             for (FacesMessage message : facesMessages)
                             {
-                                message.setSeverity(FacesMessage.SEVERITY_ERROR);
                                 context.addMessage(input.getClientId(context), message);
                             }
                         }

Modified: myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/_ComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/_ComponentUtils.java?rev=1749736&r1=1749735&r2=1749736&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/_ComponentUtils.java (original)
+++ myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/_ComponentUtils.java Wed Jun 22 16:31:00 2016
@@ -291,7 +291,6 @@ class _ComponentUtils
                     FacesMessage facesMessage = e.getFacesMessage();
                     if (facesMessage != null)
                     {
-                        facesMessage.setSeverity(FacesMessage.SEVERITY_ERROR);
                         context.addMessage(input.getClientId(context), facesMessage);
                     }
                     Collection<FacesMessage> facesMessages = e.getFacesMessages();
@@ -299,7 +298,6 @@ class _ComponentUtils
                     {
                         for (FacesMessage message : facesMessages)
                         {
-                            message.setSeverity(FacesMessage.SEVERITY_ERROR);
                             context.addMessage(input.getClientId(context), message);
                         }
                     }
@@ -333,7 +331,6 @@ class _ComponentUtils
                         FacesMessage facesMessage = ((ValidatorException)cause).getFacesMessage();
                         if (facesMessage != null)
                         {
-                            facesMessage.setSeverity(FacesMessage.SEVERITY_ERROR);
                             context.addMessage(input.getClientId(context), facesMessage);
                         }
                         Collection<FacesMessage> facesMessages = ((ValidatorException)cause).getFacesMessages();
@@ -341,7 +338,6 @@ class _ComponentUtils
                         {
                             for (FacesMessage message : facesMessages)
                             {
-                                message.setSeverity(FacesMessage.SEVERITY_ERROR);
                                 context.addMessage(input.getClientId(context), message);
                             }
                         }