From 6e40330408b85c580b948d10594102d92dc568ac Mon Sep 17 00:00:00 2001 From: "jinwooim.bae" Date: Fri, 21 Mar 2014 12:13:30 +0900 Subject: [PATCH] ANIMATOR : Fixed null pointer dereferences This code is null pointer dereferences. so it is Fixed. Change-Id: I5638026be3e9a64d4d7d1cec1449a653d22d928e Signed-off-by: jinwooim.bae --- .../ui/views/timeline/command/TimelineFrameDeleteCommand.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/command/TimelineFrameDeleteCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/command/TimelineFrameDeleteCommand.java index 28e22e9..0927b24 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/command/TimelineFrameDeleteCommand.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/command/TimelineFrameDeleteCommand.java @@ -86,9 +86,13 @@ public class TimelineFrameDeleteCommand extends Command { */ @Override public void execute() { - if (curveFrames != null) - ((AnimatorFrame) keyframe.getPrevChild(frame)) - .setCurveFrames(new ArrayList()); + if (curveFrames != null) { + AnimatorModel childFrame = keyframe.getPrevChild(frame); + if (childFrame != null) { + ((AnimatorFrame) childFrame).setCurveFrames(new ArrayList()); + } + } + keyframe.removeChild(frame, true); AnimatorModelManager animatorModelManager = -- 2.7.4