You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2010/08/23 23:50:04 UTC
svn commit: r988327 - in
/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal:
application/StateManagerImpl.java context/RequestContextImpl.java
Author: sobryan
Date: Mon Aug 23 21:50:04 2010
New Revision: 988327
URL: http://svn.apache.org/viewvc?rev=988327&view=rev
Log:
TRINIDAD-1888: Need to change log level of partial trigger log message.
TRINIDAD-1886: StateManagerImpl.java - popRoot needs to use newInstance in a portlet use case
Thanks Nathan for the patch
Modified:
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?rev=988327&r1=988326&r2=988327&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Mon Aug 23 21:50:04 2010
@@ -1311,11 +1311,19 @@ public class StateManagerImpl extends St
{
//IMPORTANT: To avoid introducing a runtime dependency on the bridge,
//this method should only be executed when we have a portlet
- //request. If we do have a portlet request then the bridge
- //should be available anyway. Trinidad has a compile-time dependency
- //on the PortletBridge API but DOES NOT have a runtime dependency on
- //those clases. It is very important to keep this seperation.
- newRoot = PortletUtils.getPortletViewRoot(newRoot);
+ //request.
+ try
+ {
+ newRoot = (UIViewRoot) root.getClass().newInstance();
+ }
+ catch (InstantiationException e)
+ {
+ _LOG.finest("Unable to instantiate new root of type class \"{0}\".", root.getClass());
+ }
+ catch (IllegalAccessException e)
+ {
+ _LOG.finest("IllegalAccessException on new root of type class \"{0}\".", root.getClass());
+ }
}
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?rev=988327&r1=988326&r2=988327&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java Mon Aug 23 21:50:04 2010
@@ -579,7 +579,7 @@ public class RequestContextImpl extends
if (master == null)
{
- _LOG.warning("CANNOT_FIND_PARTIAL_TRIGGER", new Object[] {trigger, listener});
+ _LOG.fine("CANNOT_FIND_PARTIAL_TRIGGER", new Object[] {trigger, listener});
}
else
{