From 41fe7b2064f2f0343c23f038596a8e771d42f3bf Mon Sep 17 00:00:00 2001 From: "kh5325.kim" Date: Fri, 25 Oct 2013 01:59:08 +0900 Subject: [PATCH] Fixed some Prevent issues - added explicit null check and lazy init. Change-Id: I49cfa034b5b9f8767d88ca77e7cdceff3b9ea0d8 Signed-off-by: kh5325.kim --- .../tizen/common/connection/sdblib/dnd/FileEntryDropAdapter.java | 2 +- org.tizen.common/src/org/tizen/common/core/command/UserField.java | 4 ++++ .../common/core/command/file/DirectoryCopyHandlingCommand.java | 2 ++ .../src/org/tizen/common/util/DeferredTaskManager.java | 8 ++++---- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/sdblib/dnd/FileEntryDropAdapter.java b/org.tizen.common.connection/src/org/tizen/common/connection/sdblib/dnd/FileEntryDropAdapter.java index f3b5aab..be5fe77 100755 --- a/org.tizen.common.connection/src/org/tizen/common/connection/sdblib/dnd/FileEntryDropAdapter.java +++ b/org.tizen.common.connection/src/org/tizen/common/connection/sdblib/dnd/FileEntryDropAdapter.java @@ -70,7 +70,7 @@ public class FileEntryDropAdapter implements IDropActionDelegate String[] remotePaths = FileEntryTransfer.getInstance().fromByteArray((byte[]) source); - if (remotePaths.length < 1) + if (remotePaths == null || remotePaths.length < 1) { return false; } diff --git a/org.tizen.common/src/org/tizen/common/core/command/UserField.java b/org.tizen.common/src/org/tizen/common/core/command/UserField.java index 1f5c46a..36be80b 100755 --- a/org.tizen.common/src/org/tizen/common/core/command/UserField.java +++ b/org.tizen.common/src/org/tizen/common/core/command/UserField.java @@ -143,6 +143,10 @@ public class UserField public void addSupport( final Object support ) { + if ( null == this.supports ) + { + this.supports = new ArrayList(); + } this.supports.add( support ); } diff --git a/org.tizen.common/src/org/tizen/common/core/command/file/DirectoryCopyHandlingCommand.java b/org.tizen.common/src/org/tizen/common/core/command/file/DirectoryCopyHandlingCommand.java index 01cbcec..0c0171a 100755 --- a/org.tizen.common/src/org/tizen/common/core/command/file/DirectoryCopyHandlingCommand.java +++ b/org.tizen.common/src/org/tizen/common/core/command/file/DirectoryCopyHandlingCommand.java @@ -79,6 +79,8 @@ public class DirectoryCopyHandlingCommand extends FileHandlingCommand { throws Exception { FileHandler handler = context.getFileHandler(); Policy policy = context.getPolicy(Policy.EXIST_FILE_WHEN_COPY); + if(policy == null) + return; OptionPolicy optionPolicy = policy.adapt( OptionPolicy.class ); Option[] options = optionPolicy.getOptions(); diff --git a/org.tizen.common/src/org/tizen/common/util/DeferredTaskManager.java b/org.tizen.common/src/org/tizen/common/util/DeferredTaskManager.java index d164190..3e02299 100755 --- a/org.tizen.common/src/org/tizen/common/util/DeferredTaskManager.java +++ b/org.tizen.common/src/org/tizen/common/util/DeferredTaskManager.java @@ -33,9 +33,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * DefferedTaskManager. + * DeferredTaskManager. * - * Object to manage a deffered task. + * Object to manage a deferred task. * * When {@code #tick()} is called, it is scheduled. * @@ -115,7 +115,7 @@ DeferredTaskManager } /** - * Return idle time for deffering + * Return idle time for deferring * * @return idle time */ @@ -127,7 +127,7 @@ DeferredTaskManager } /** - * Set idle time for deffering + * Set idle time for deferring * * @param idleTime time to wait */ -- 2.7.4