aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2017-09-26 16:17:55 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2017-09-26 16:20:04 +0800
commit15230b1e32b5f67ee615c41a1d237f0ab80243dc (patch)
tree4d86e3aabadb5c486ac60dcce064e6743f29c693
parent9d433d0d8cb7dd510c3bf3250f9a1b2df72ead05 (diff)
replace while with for
major: L73 L110 Change-Id: I749bd15801cec68f2eecf320e27196da6c795d3f Signed-off-by: Harry Huang <huangxiangyu5@huawei.com> Issue-Id: VNFSDK-85
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java
index 432ee219..e45d31bf 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vnfsdk/marketplace/filemanage/http/ToolUtil.java
@@ -83,8 +83,12 @@ public class ToolUtil {
}
File destDir = new File(useDestDirName);
if (destDir.exists() && overlay) {
- new File(destDirName).delete();
- } else if ((destDir.exists() && !overlay) || (!destDir.exists() && !destDir.mkdirs())) {
+ new File(useDestDirName).delete();
+ } else if (destDir.exists() && !overlay) {
+ return false;
+ }
+
+ if (!destDir.mkdirs()) {
return false;
}
@@ -107,11 +111,11 @@ public class ToolUtil {
) {
byte[] buffer = new byte[1024];
- int byteread = 0;
- while ((byteread = in.read(buffer)) != -1) {
+ for (int byteread = 0; (byteread = in.read(buffer)) != -1;) {
out.write(buffer, 0, byteread);
}
+
return true;
} catch (IOException e) {
LOGGER.error("IOException in copyFile", e);