svn commit: r480449 - /jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java

[jochen]

Author: jochen
Date: Tue Nov 28 23:43:08 2006
New Revision: 480449

URL: http://svn.apache.org/viewvc?view=rev&rev=480449
Log:
Avoid duplicating local field names and unnecessary else.

Modified:
    
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java

Modified: 
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java?view=diff&rev=480449&r1=480448&r2=480449
==============================================================================
--- 
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
 (original)
+++ 
jakarta/commons/proper/fileupload/trunk/src/java/org/apache/commons/fileupload/disk/DiskFileItem.java
 Tue Nov 28 23:43:08 2006
@@ -262,9 +262,8 @@
     public boolean isInMemory() {
         if (cachedContent != null) {
             return true;
-        } else {
-            return dfos.isInMemory();
         }
+        return dfos.isInMemory();
     }
 
 
@@ -585,9 +584,9 @@
             tempDir = new File(System.getProperty("java.io.tmpdir"));
         }
 
-        String fileName = "upload_" + UID + "_" + getUniqueId() + ".tmp";
+        String tempFileName = "upload_" + UID + "_" + getUniqueId() + ".tmp";
 
-        File f = new File(tempDir, fileName);
+        File f = new File(tempDir, tempFileName);
         FileCleaner.track(f, this);
         return f;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]