svn commit: r1453878 - /commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java

[simonetripodi]

Author: simonetripodi
Date: Thu Mar  7 14:12:04 2013
New Revision: 1453878

URL: http://svn.apache.org/r1453878
Log:
PMD: These nested if statements could be combined

Modified:
    
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java

Modified: 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java?rev=1453878&r1=1453877&r2=1453878&view=diff
==============================================================================
--- 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
 (original)
+++ 
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/MultipartStream.java
 Thu Mar  7 14:12:04 2013
@@ -862,10 +862,8 @@ public class MultipartStream {
             if (closed) {
                 throw new FileItemStream.ItemSkippedException();
             }
-            if (available() == 0) {
-                if (makeAvailable() == 0) {
-                    return -1;
-                }
+            if (available() == 0 && makeAvailable() == 0) {
+                return -1;
             }
             ++total;
             int b = buffer[head++];