From 50b9905593d1c73567dbf7083ecce643ff6660cf Mon Sep 17 00:00:00 2001 From: "Bonyong.lee" Date: Wed, 5 Jun 2013 16:49:45 +0900 Subject: [PATCH] [Title]Bug fix as sdblib is refactored [Type] [Module] [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] --- org.tizen.common.sdblib/src/org/tizen/sdblib/SdbHelper.java | 2 +- org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/SdbHelper.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/SdbHelper.java index c59d059..5b169f8 100644 --- a/org.tizen.common.sdblib/src/org/tizen/sdblib/SdbHelper.java +++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/SdbHelper.java @@ -404,7 +404,7 @@ public class SdbHelper { throw new IOException("channel EOF"); } else if (count == 0) { // TODO: need more accurate timeout? - if (timeout != 0 && numWaits * WAIT_TIME > timeout) { + if ( 0 < timeout && numWaits * WAIT_TIME > timeout) { Log.d("sdb", "write: timeout"); throw new TimeoutException(); } diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java index 7efbe52..5459222 100644 --- a/org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java +++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java @@ -267,10 +267,12 @@ implements Closeable doPull( final FileEntry remote, final OutputStream out, - final ISyncProgressMonitor monitor, + ISyncProgressMonitor monitor, final int timeOut ) { + monitor = nvl( monitor, NullSyncProgressMonitor.getInstance() ); + // access the destination file // create the stream to write in the file. We use a new try/catch block to differentiate -- 2.7.4