myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sobr...@apache.org
Subject svn commit: r987230 - in /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal: application/StateManagerImpl.java context/RequestContextImpl.java
Date Thu, 19 Aug 2010 16:54:59 GMT
Author: sobryan
Date: Thu Aug 19 16:54:58 2010
New Revision: 987230

URL: http://svn.apache.org/viewvc?rev=987230&view=rev
Log:
TRINIDAD-1886 - StateManagerImpl.java - popRoot needs to use newInstance in a portlet use
case
TRINIDAD-1888 - Need to change log level of partial trigger log message.

Applied the patches submitted by Hokie..  Thanks Hokie..

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?rev=987230&r1=987229&r2=987230&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
(original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
Thu Aug 19 16:54:58 2010
@@ -1279,11 +1279,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/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java?rev=987230&r1=987229&r2=987230&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
(original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/RequestContextImpl.java
Thu Aug 19 16:54:58 2010
@@ -602,7 +602,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
       {



Mime
View raw message