[Title] Fixed the calculation of file transfer rate

diff --git a/package/changelog b/package/changelog
index 82dfb32467ba0f1d1c9a46f485a95a372bcc5f35..c3b17bbd324e9bbe70bf340661c2b55b10b52201 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 2.1.21
+- Fixed the calculation of file transfer rate 
+== donghee yang <donghee.yang@samsung.com> 2013-04-11
 * 2.1.20
 - Separate the process for log monitor
 == donghee yang <donghee.yang@samsung.com> 2013-04-10

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 2eba839a2df585a4feb92f687e3239954bd30c17..a5976604ba1388611675bb35f1c067a86868de2b 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : dibs
-Version :2.1.20
+Version :2.1.21
 Maintainer : taejun ha<taejun.ha@samsung.com>, jiil hyoun <jiil.hyoun@samsung.com>, donghyuk yang <donghyouk.yang@samsung.com>, donghee yang <donghee.yang@samsung.com>, sungmin kim <dev.sungmin.kim@samsung.com
 
 Package : dibs

diff --git a/src/common/FileTransferViaDirect.rb b/src/common/FileTransferViaDirect.rb
index 4f78222f07884c101a05fb8c7ed5e4f1843eb131..3d44890f4590abc4093a753bd040a4f181ea3ab8 100644 (file)
--- a/src/common/FileTransferViaDirect.rb
+++ b/src/common/FileTransferViaDirect.rb
@@ -79,7 +79,7 @@ class FileTransferDirect
                                        end
                                end
                                trEnd = Time.now()
-                               trRate = (full_size * 1000 / (trEnd - trBegin) / 1000).to_i
+                               trRate = (full_size / (trEnd - trBegin) / 1000).to_i
                                @log.info "Upload is succeeded! #{trRate}KByte/s"
                                conn.puts "SEND_OK"
 
@@ -136,7 +136,7 @@ class FileTransferDirect
                                        end
                                end
                                trEnd = Time.now()
-                               trRate = (full_size * 1000 / (trEnd - trBegin) / 1000).to_i
+                               trRate = (full_size / (trEnd - trBegin) / 1000).to_i
                                @log.info "Download is succeeded! #{trRate}KByte/s"
 
                                conn.puts "RECEIVE_OK"