You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/07/14 00:46:11 UTC

svn commit: r793737 - /myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java

Author: lu4242
Date: Mon Jul 13 22:46:11 2009
New Revision: 793737

URL: http://svn.apache.org/viewvc?rev=793737&view=rev
Log:
PORTLETBRIDGE-84 Null values on Request map cause error

Modified:
    myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java

Modified: myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java?rev=793737&r1=793736&r2=793737&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java (original)
+++ myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java Mon Jul 13 22:46:11 2009
@@ -1311,7 +1311,7 @@
 
   private boolean isExcludedFromBridgeRequestScope(String key, Object value, List<String> preExistingList)
   {
-    return ((value.getClass().getAnnotation(ExcludeFromManagedRequestScope.class) != null) ||
+    return ((value != null && value.getClass().getAnnotation(ExcludeFromManagedRequestScope.class) != null) ||
          (preExistingList != null && preExistingList.contains(key)) ||
          isPreDefinedExcludedObject(key, value) ||
          isConfiguredExcludedAttribute(key));