Author: lryan
Date: Mon Mar 2 21:20:21 2009
New Revision: 749439
URL: http://svn.apache.org/viewvc?rev=749439&view=rev
Log:
Fix for NPE in check to determine whether content output should be sanitized.
SHINDIG-958
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java?rev=749439&r1=749438&r2=749439&view=diff
==============================================================================
---
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
(original)
+++
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java
Mon Mar 2 21:20:21 2009
@@ -138,7 +138,8 @@
* @return
*/
public boolean sanitizeOutput() {
- return (getCurrentView().getType() == View.ContentType.X_HTML_SANITIZED ||
-
"1".equals(getContext().getParameter(ProxyBase.SANITIZE_CONTENT_PARAM)));
+ return (getCurrentView() != null &&
+ getCurrentView().getType() == View.ContentType.X_HTML_SANITIZED) ||
+
"1".equals(getContext().getParameter(ProxyBase.SANITIZE_CONTENT_PARAM));
}
}
\ No newline at end of file
