You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2009/06/16 18:08:40 UTC
svn commit: r785273 - in
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application:
PortletViewHandlerImpl.java PortletViewHandlerRenderResponseWrapper.java
PortletViewHandlerResourceResponseWrapper.java
Author: mfreedman
Date: Tue Jun 16 16:08:40 2009
New Revision: 785273
URL: http://svn.apache.org/viewvc?rev=785273&view=rev
Log:
Improve exceptional case checking in the render/resource wrappers -- its possible to get a nullPointer Exception in getBytes if we aren't getting characters but there is no byte array.
Modified:
myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java
myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerRenderResponseWrapper.java
myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerResourceResponseWrapper.java
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java?rev=785273&r1=785272&r2=785273&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java Tue Jun 16 16:08:40 2009
@@ -439,18 +439,20 @@
{
// Put the AFTER_VIEW_CONTENT into request scope
// temporarily
+ Object o = null;
if (renderResponseWrapper != null)
- {
- extContext.getRequestMap().put(
- Bridge.AFTER_VIEW_CONTENT,
- (renderResponseWrapper.isChars()) ? (Object) renderResponseWrapper.getChars() : (Object) renderResponseWrapper.getBytes());
+ {
+ o = (renderResponseWrapper.isChars()) ? (Object) renderResponseWrapper.getChars() : (Object) renderResponseWrapper.getBytes();
}
else if (resourceResponseWrapper != null)
{
- extContext.getRequestMap().put(
- Bridge.AFTER_VIEW_CONTENT,
- (resourceResponseWrapper.isChars()) ? (Object) resourceResponseWrapper.getChars() : (Object) resourceResponseWrapper.getBytes());
+ o = (resourceResponseWrapper.isChars()) ? (Object) resourceResponseWrapper.getChars() : (Object) resourceResponseWrapper.getBytes();
+ }
+ if (o != null)
+ {
+ extContext.getRequestMap().put(Bridge.AFTER_VIEW_CONTENT, o);
}
+
}
}
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerRenderResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerRenderResponseWrapper.java?rev=785273&r1=785272&r2=785273&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerRenderResponseWrapper.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerRenderResponseWrapper.java Tue Jun 16 16:08:40 2009
@@ -126,7 +126,7 @@
public byte[] getBytes()
{
- if (!isChars())
+ if (!isChars() && mBytes != null)
{
return mBytes.toByteArray();
} else
@@ -137,7 +137,7 @@
public char[] getChars()
{
- if (isChars())
+ if (isChars() && mCharWriter != null)
{
return mCharWriter.toCharArray();
} else
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerResourceResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerResourceResponseWrapper.java?rev=785273&r1=785272&r2=785273&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerResourceResponseWrapper.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerResourceResponseWrapper.java Tue Jun 16 16:08:40 2009
@@ -123,7 +123,7 @@
public byte[] getBytes()
{
- if (!isChars())
+ if (!isChars() && mBytes != null)
{
return mBytes.toByteArray();
} else
@@ -134,7 +134,7 @@
public char[] getChars()
{
- if (isChars())
+ if (isChars() && mCharWriter != null)
{
return mCharWriter.toCharArray();
} else