You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gc...@apache.org on 2010/04/09 00:17:12 UTC
svn commit: r932153 -
/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/MessageFactory.java
Author: gcrawford
Date: Thu Apr 8 22:17:12 2010
New Revision: 932153
URL: http://svn.apache.org/viewvc?rev=932153&view=rev
Log:
TRINIDAD-1781 duplicate string for facesMessage created from Throwable
Modified:
myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/MessageFactory.java
Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/MessageFactory.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/MessageFactory.java?rev=932153&r1=932152&r2=932153&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/MessageFactory.java (original)
+++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/util/MessageFactory.java Thu Apr 8 22:17:12 2010
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -56,7 +56,7 @@ public final class MessageFactory
}
// bug 4733165:
FacesMessage message =
- new FacesMessage(FacesMessage.SEVERITY_ERROR, detail, detail);
+ new FacesMessage(FacesMessage.SEVERITY_ERROR, null, detail);
return message;
}
@@ -420,7 +420,7 @@ public final class MessageFactory
context = FacesContext.getCurrentInstance();
o = ((ValueExpression) o).getValue(context.getELContext());
}
-
+
resolvedParameters[i] = o;
}
return resolvedParameters;
@@ -621,22 +621,22 @@ public final class MessageFactory
String detailMsgPattern = (String)_customDetailErrorMessage.getValue(context.getELContext());
if(detailMsgPattern == null)
{
- // Set a default message that might get used by FacesException
- // constructor for example. This will often happen because
- // ValidatorException constructor will call this method to
- // get the exception message for its parent. So by default
+ // Set a default message that might get used by FacesException
+ // constructor for example. This will often happen because
+ // ValidatorException constructor will call this method to
+ // get the exception message for its parent. So by default
// we'll use the EL String.
- // Note that by default
+ // Note that by default
detailMsgPattern = _customDetailErrorMessage.getExpressionString();
-
- // Since that string will get parsed by FastMessageFormat, the { }
+
+ // Since that string will get parsed by FastMessageFormat, the { }
// of the EL must be escaped
//detailMsgPattern = '\'' + detailMsgPattern + '\'';
-
+
// No need to format this string, just return it here.
return detailMsgPattern;
}
-
+
Object[] params = super.getParameters();
if (_hasBoundParameters)