svn commit: r958767 - /shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java

[jo...@apache.org]

Author: johnh
Date: Mon Jun 28 22:14:32 2010
New Revision: 958767

URL: http://svn.apache.org/viewvc?rev=958767&view=rev
Log:
Avoid NPE when no_expand=1 and resize_[w or h] is not present.


Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java?rev=958767&r1=958766&r2=958767&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/image/BasicImageRewriter.java Mon Jun 28 22:14:32 2010
@@ -145,8 +145,8 @@ public class BasicImageRewriter implemen
       
       boolean noExpand = "1".equals(request.getParam(PARAM_NO_EXPAND));
       if (noExpand &&
-          imageInfo.getHeight() <= requestedHeight &&
-          imageInfo.getWidth() <= requestedWidth) {
+          (requestedHeight == null || imageInfo.getHeight() <= requestedHeight) &&
+          (requestedWidth == null || imageInfo.getWidth() <= requestedWidth)) {
         // Don't do anything, since the current image fits within the bounding area.
         isResizeRequested = false;
       }