Merge pull request boncey#143 from Linus12/master

Darren Greaves · Darren Greaves · commit 281049ea9597 · 2015-08-02T17:48:22.000+01:00
Update Size.java
diff --git a/Flickr4Java/src/main/java/com/flickr4java/flickr/photos/Size.java b/Flickr4Java/src/main/java/com/flickr4java/flickr/photos/Size.java
@@ -260,7 +260,7 @@ public void setWidth(int width) {
 
     public void setWidth(String width) {
 
-        if (width != null) {
+        if (!(width == null || "".equals(width))) {   // checking both null and empty
             setWidth(Integer.parseInt(width));
         }
     }
@@ -277,7 +277,7 @@ public void setHeight(int height) {
 
     public void setHeight(String height) {
 
-        if (height != null) {
+        if (!(height == null || "".equals(height))) {   // checking both null and empty
             setHeight(Integer.parseInt(height));
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,7 @@ public void setWidth(int width) {`
`260`	`260`
`261`	`261`	`public void setWidth(String width) {`
`262`	`262`
`263`		`- if (width != null) {`
	`263`	`+ if (!(width == null \|\| "".equals(width))) { // checking both null and empty`
`264`	`264`	`setWidth(Integer.parseInt(width));`
`265`	`265`	`}`
`266`	`266`	`}`
`@@ -277,7 +277,7 @@ public void setHeight(int height) {`
`277`	`277`
`278`	`278`	`public void setHeight(String height) {`
`279`	`279`
`280`		`- if (height != null) {`
	`280`	`+ if (!(height == null \|\| "".equals(height))) { // checking both null and empty`
`281`	`281`	`setHeight(Integer.parseInt(height));`
`282`	`282`	`}`
`283`	`283`	`}`