Uploaded image for project: 'FishEye'
  1. FishEye
  2. FE-6509

Smart Commits don't work In FishEye when Day or Week time values are present

    XMLWordPrintable

Details

    Description

      Summary

      When performing a Smart commit in FishEye (in 3.9 or later) if the value of days or weeks is present then the Smart Commit will fail

      Environment

      • FishEye 3.9+
      • Connected to A JIRA instance

      Steps to Reproduce

      1. Perform a Smart Commit that contains d or w values for the time to input

      Expected Results

      The Time referenced is added to the JIRA ticket

      Actual Results

      No Time is added to the JIRA ticket if days or weeks are referenced in the commit, even if hours is also present as an input time.

      The below exception is thrown in the atlassian-fisheye-xxxx-xx-xx.log.log file:

      Hours and Days mixed:

      CUS-4 #comment reproduction of failed time adding #time 2d 5h
      
      2016-05-02 12:17:56,481 ERROR [CommitNotifier1 ] com.atlassian.fecru.plugin.commithook.internal.DefaultCommitHookManager DefaultCommitHookManager-handleCommit - Error processing commit hook JIRA Issue Transitions
      java.lang.IllegalArgumentException: Time spent '2d 5h' must be not null and greater then zero
      	at com.google.common.base.Preconditions.checkArgument(Preconditions.java:145) [guava-18.0.jar:?]
      	at com.atlassian.fecru.plugins.jirarest.JiraIssueImpl$6.run(JiraIssueImpl.java:290) [?:?]
      	at com.atlassian.fecru.plugins.jirarest.restinvoker.JiraRestInvokerImpl.invoke(JiraRestInvokerImpl.java:46) [?:?]
      	at com.atlassian.fecru.plugins.jirarest.restinvoker.JiraRestInvokerImpl.invokeAuthenticated(JiraRestInvokerImpl.java:29) [?:?]
      	at com.atlassian.fecru.plugins.jirarest.JiraIssueImpl.logWork(JiraIssueImpl.java:286) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.commands.TimeCommandHandler$1.execute(TimeCommandHandler.java:58) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.commands.CommandHandler.doForEachIssue(CommandHandler.java:112) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.commands.TimeCommandHandler.doForProject(TimeCommandHandler.java:53) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.commands.CommandHandler.handleCommand(CommandHandler.java:52) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.JIRACommitHook$1.perform(JIRACommitHook.java:66) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.JIRACommitHook$1.perform(JIRACommitHook.java:61) [?:?]
      	at com.atlassian.crucible.spi.impl.DefaultImpersonationService.doOperationAsUser(DefaultImpersonationService.java:122) [fisheye.jar:?]
      	at com.atlassian.crucible.spi.impl.DefaultImpersonationService.doAsUser(DefaultImpersonationService.java:45) [fisheye.jar:?]
      	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [?:1.8.0_45]
      	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [?:1.8.0_45]
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [?:1.8.0_45]
      	at java.lang.reflect.Method.invoke(Method.java:497) [?:1.8.0_45]
      	at org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:317) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:190) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:157) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:85) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at com.cenqua.crucible.hibernate.WithSessionAspect.doCloseSession(WithSessionAspect.java:56) [fisheye.jar:?]
      	at sun.reflect.GeneratedMethodAccessor276.invoke(Unknown Source) [?:?]
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [?:1.8.0_45]
      	at java.lang.reflect.Method.invoke(Method.java:497) [?:1.8.0_45]
      	at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:621) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:610) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:68) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:168) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:92) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:179) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:207) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at com.sun.proxy.$Proxy113.doAsUser(Unknown Source) [?:?]
      	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [?:1.8.0_45]
      	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [?:1.8.0_45]
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [?:1.8.0_45]
      	at java.lang.reflect.Method.invoke(Method.java:497) [?:1.8.0_45]
      	at com.atlassian.plugin.util.ContextClassLoaderSettingInvocationHandler.invoke(ContextClassLoaderSettingInvocationHandler.java:26) [atlassian-plugins-core-4.1.5.jar:?]
      	at com.sun.proxy.$Proxy170.doAsUser(Unknown Source) [?:?]
      	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [?:1.8.0_45]
      	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [?:1.8.0_45]
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [?:1.8.0_45]
      	at java.lang.reflect.Method.invoke(Method.java:497) [?:1.8.0_45]
      	at com.atlassian.plugin.osgi.bridge.external.HostComponentFactoryBean$DynamicServiceInvocationHandler.invoke(HostComponentFactoryBean.java:136) [?:?]
      	at com.sun.proxy.$Proxy170.doAsUser(Unknown Source) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.JIRACommitHook.processHook(JIRACommitHook.java:61) [?:?]
      	at com.atlassian.fecru.plugin.commithook.internal.DefaultCommitHookManager.handleCommit(DefaultCommitHookManager.java:223) [fecru-commithooks-plugin-4.1.0-SNAPSHOT_1462183376000.jar:?]
      	at com.atlassian.fecru.plugin.commithook.internal.DefaultCommitHookManager.handleCommit(DefaultCommitHookManager.java:192) [fecru-commithooks-plugin-4.1.0-SNAPSHOT_1462183376000.jar:?]
      	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [?:1.8.0_45]
      	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [?:1.8.0_45]
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [?:1.8.0_45]
      	at java.lang.reflect.Method.invoke(Method.java:497) [?:1.8.0_45]
      	at com.atlassian.event.internal.SingleParameterMethodListenerInvoker.invoke(SingleParameterMethodListenerInvoker.java:36) [atlassian-event-3.0.0.jar:?]
      	at com.atlassian.event.internal.AsynchronousAbleEventDispatcher$1$1.run(AsynchronousAbleEventDispatcher.java:46) [atlassian-event-3.0.0.jar:?]
      	at com.google.common.util.concurrent.MoreExecutors$DirectExecutorService.execute(MoreExecutors.java:299) [guava-18.0.jar:?]
      	at com.atlassian.event.internal.AsynchronousAbleEventDispatcher.dispatch(AsynchronousAbleEventDispatcher.java:105) [atlassian-event-3.0.0.jar:?]
      	at com.atlassian.event.internal.LockFreeEventPublisher$Publisher.dispatch(LockFreeEventPublisher.java:260) [atlassian-event-3.0.0.jar:?]
      	at com.atlassian.event.internal.LockFreeEventPublisher.publish(LockFreeEventPublisher.java:102) [atlassian-event-3.0.0.jar:?]
      	at com.atlassian.fisheye.event.FisheyeEventPublisher$EventPublication.publish(FisheyeEventPublisher.java:63) [fisheye.jar:?]
      	at com.atlassian.fisheye.event.FisheyeEventPublisher.publish(FisheyeEventPublisher.java:35) [fisheye.jar:?]
      	at com.cenqua.fisheye.rep.CommitEventGenerator$CommitEventNotifier$1.apply(CommitEventGenerator.java:290) [fisheye.jar:?]
      	at com.cenqua.fisheye.rep.CommitEventGenerator$CommitEventNotifier$1.apply(CommitEventGenerator.java:273) [fisheye.jar:?]
      	at com.cenqua.fisheye.rep.RepositoryHandle.withEngine(RepositoryHandle.java:511) [fisheye.jar:?]
      	at com.cenqua.fisheye.rep.CommitEventGenerator$CommitEventNotifier.run(CommitEventGenerator.java:273) [fisheye.jar:?]
      	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) [?:1.8.0_45]
      	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) [?:1.8.0_45]
      	at java.lang.Thread.run(Thread.java:745) [?:1.8.0_45]
      2016-05-02 12:17:56,489 DEBUG [qtp1369468094-159 ] fisheye ProfilingServletFilter-logRequest - start request GET /foo/static/o6jnso/2static/style/jquery/theme/ui.theme.css sessionid=1pzpi2mryzjrg1gd6804wzsjqy
      2016-05-02 12:17:56,495 DEBUG [qtp1369468094-159 ] fisheye ProfilingServletFilter-logRequest - end request in 6ms GET /foo/static/o6jnso/2static/style/jquery/theme/ui.theme.css sessionid=1pzpi2mryzjrg1gd6804wzsjqy 304 mem=0.093MB
      2016-05-02 12:17:56,498 WARN  [CommitNotifier1 ] com.atlassian.fecru.plugin.commithook.internal.DefaultCommitHookManager DefaultCommitHookManager-collateErrors - Error while processing a commit directive handled by plugin com.atlassian.fecru.plugin.commithook.fecru-jiracommithook-plugin:jiracommithook for changeset bd104acd02e3c92057f82b3a2841596c1612c235 in repository TestRepo:
          FishEye could not execute the smart commit because of an unexpected error: Time spent '2d 5h' must be not null and greater then zero
          Please manually perform the required action within Crucible.
      

      Just Days:

      CUS-4 #comment just a day value #time 2d
      
      2016-05-02 12:23:01,031 ERROR [CommitNotifier1 ] com.atlassian.fecru.plugin.commithook.internal.DefaultCommitHookManager DefaultCommitHookManager-handleCommit - Error processing commit hook JIRA Issue Transitions
      java.lang.IllegalArgumentException: Time spent '2d' must be not null and greater then zero
      	at com.google.common.base.Preconditions.checkArgument(Preconditions.java:145) [guava-18.0.jar:?]
      	at com.atlassian.fecru.plugins.jirarest.JiraIssueImpl$6.run(JiraIssueImpl.java:290) [?:?]
      	at com.atlassian.fecru.plugins.jirarest.restinvoker.JiraRestInvokerImpl.invoke(JiraRestInvokerImpl.java:46) [?:?]
      	at com.atlassian.fecru.plugins.jirarest.restinvoker.JiraRestInvokerImpl.invokeAuthenticated(JiraRestInvokerImpl.java:29) [?:?]
      	at com.atlassian.fecru.plugins.jirarest.JiraIssueImpl.logWork(JiraIssueImpl.java:286) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.commands.TimeCommandHandler$1.execute(TimeCommandHandler.java:58) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.commands.CommandHandler.doForEachIssue(CommandHandler.java:112) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.commands.TimeCommandHandler.doForProject(TimeCommandHandler.java:53) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.commands.CommandHandler.handleCommand(CommandHandler.java:52) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.JIRACommitHook$1.perform(JIRACommitHook.java:66) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.JIRACommitHook$1.perform(JIRACommitHook.java:61) [?:?]
      	at com.atlassian.crucible.spi.impl.DefaultImpersonationService.doOperationAsUser(DefaultImpersonationService.java:122) [fisheye.jar:?]
      	at com.atlassian.crucible.spi.impl.DefaultImpersonationService.doAsUser(DefaultImpersonationService.java:45) [fisheye.jar:?]
      	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [?:1.8.0_45]
      	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [?:1.8.0_45]
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [?:1.8.0_45]
      	at java.lang.reflect.Method.invoke(Method.java:497) [?:1.8.0_45]
      	at org.springframework.aop.support.AopUtils.invokeJoinpointUsingReflection(AopUtils.java:317) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.framework.ReflectiveMethodInvocation.invokeJoinpoint(ReflectiveMethodInvocation.java:190) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:157) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.aspectj.MethodInvocationProceedingJoinPoint.proceed(MethodInvocationProceedingJoinPoint.java:85) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at com.cenqua.crucible.hibernate.WithSessionAspect.doCloseSession(WithSessionAspect.java:56) [fisheye.jar:?]
      	at sun.reflect.GeneratedMethodAccessor276.invoke(Unknown Source) [?:?]
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [?:1.8.0_45]
      	at java.lang.reflect.Method.invoke(Method.java:497) [?:1.8.0_45]
      	at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethodWithGivenArgs(AbstractAspectJAdvice.java:621) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.aspectj.AbstractAspectJAdvice.invokeAdviceMethod(AbstractAspectJAdvice.java:610) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.aspectj.AspectJAroundAdvice.invoke(AspectJAroundAdvice.java:68) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:168) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.interceptor.ExposeInvocationInterceptor.invoke(ExposeInvocationInterceptor.java:92) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.framework.ReflectiveMethodInvocation.proceed(ReflectiveMethodInvocation.java:179) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at org.springframework.aop.framework.JdkDynamicAopProxy.invoke(JdkDynamicAopProxy.java:207) [spring-aop-4.0.9.RELEASE.jar:4.0.9.RELEASE]
      	at com.sun.proxy.$Proxy113.doAsUser(Unknown Source) [?:?]
      	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [?:1.8.0_45]
      	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [?:1.8.0_45]
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [?:1.8.0_45]
      	at java.lang.reflect.Method.invoke(Method.java:497) [?:1.8.0_45]
      	at com.atlassian.plugin.util.ContextClassLoaderSettingInvocationHandler.invoke(ContextClassLoaderSettingInvocationHandler.java:26) [atlassian-plugins-core-4.1.5.jar:?]
      	at com.sun.proxy.$Proxy170.doAsUser(Unknown Source) [?:?]
      	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [?:1.8.0_45]
      	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [?:1.8.0_45]
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [?:1.8.0_45]
      	at java.lang.reflect.Method.invoke(Method.java:497) [?:1.8.0_45]
      	at com.atlassian.plugin.osgi.bridge.external.HostComponentFactoryBean$DynamicServiceInvocationHandler.invoke(HostComponentFactoryBean.java:136) [?:?]
      	at com.sun.proxy.$Proxy170.doAsUser(Unknown Source) [?:?]
      	at com.atlassian.fecru.plugin.commithook.jira.JIRACommitHook.processHook(JIRACommitHook.java:61) [?:?]
      	at com.atlassian.fecru.plugin.commithook.internal.DefaultCommitHookManager.handleCommit(DefaultCommitHookManager.java:223) [fecru-commithooks-plugin-4.1.0-SNAPSHOT_1462183376000.jar:?]
      	at com.atlassian.fecru.plugin.commithook.internal.DefaultCommitHookManager.handleCommit(DefaultCommitHookManager.java:192) [fecru-commithooks-plugin-4.1.0-SNAPSHOT_1462183376000.jar:?]
      	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [?:1.8.0_45]
      	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) [?:1.8.0_45]
      	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) [?:1.8.0_45]
      	at java.lang.reflect.Method.invoke(Method.java:497) [?:1.8.0_45]
      	at com.atlassian.event.internal.SingleParameterMethodListenerInvoker.invoke(SingleParameterMethodListenerInvoker.java:36) [atlassian-event-3.0.0.jar:?]
      	at com.atlassian.event.internal.AsynchronousAbleEventDispatcher$1$1.run(AsynchronousAbleEventDispatcher.java:46) [atlassian-event-3.0.0.jar:?]
      	at com.google.common.util.concurrent.MoreExecutors$DirectExecutorService.execute(MoreExecutors.java:299) [guava-18.0.jar:?]
      	at com.atlassian.event.internal.AsynchronousAbleEventDispatcher.dispatch(AsynchronousAbleEventDispatcher.java:105) [atlassian-event-3.0.0.jar:?]
      	at com.atlassian.event.internal.LockFreeEventPublisher$Publisher.dispatch(LockFreeEventPublisher.java:260) [atlassian-event-3.0.0.jar:?]
      	at com.atlassian.event.internal.LockFreeEventPublisher.publish(LockFreeEventPublisher.java:102) [atlassian-event-3.0.0.jar:?]
      	at com.atlassian.fisheye.event.FisheyeEventPublisher$EventPublication.publish(FisheyeEventPublisher.java:63) [fisheye.jar:?]
      	at com.atlassian.fisheye.event.FisheyeEventPublisher.publish(FisheyeEventPublisher.java:35) [fisheye.jar:?]
      	at com.cenqua.fisheye.rep.CommitEventGenerator$CommitEventNotifier$1.apply(CommitEventGenerator.java:290) [fisheye.jar:?]
      	at com.cenqua.fisheye.rep.CommitEventGenerator$CommitEventNotifier$1.apply(CommitEventGenerator.java:273) [fisheye.jar:?]
      	at com.cenqua.fisheye.rep.RepositoryHandle.withEngine(RepositoryHandle.java:511) [fisheye.jar:?]
      	at com.cenqua.fisheye.rep.CommitEventGenerator$CommitEventNotifier.run(CommitEventGenerator.java:273) [fisheye.jar:?]
      	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142) [?:1.8.0_45]
      	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617) [?:1.8.0_45]
      	at java.lang.Thread.run(Thread.java:745) [?:1.8.0_45]
      2016-05-02 12:23:01,049 WARN  [CommitNotifier1 ] com.atlassian.fecru.plugin.commithook.internal.DefaultCommitHookManager DefaultCommitHookManager-collateErrors - Error while processing a commit directive handled by plugin com.atlassian.fecru.plugin.commithook.fecru-jiracommithook-plugin:jiracommithook for changeset a6fa5665529275fddb17967bf82ddfc2fb1e69b7 in repository TestRepo:
          FishEye could not execute the smart commit because of an unexpected error: Time spent '2d' must be not null and greater then zero
          Please manually perform the required action within Crucible.
      

      Workarounds

      1. In JIRA, 1 day of work has 8 hours, so specifying the number of days * 8 as hours should work. For example, supposing someone spent one full day and additional 3 hours the next day working on something, this person could use '11h' when logging time.
      2. If Days or Weeks really need to be specified, manually add this directly to the JIRA ticket.

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              chparker ♚♛♜♝♞♟♔♕♖♗♘♙ (Inactive)
              Votes:
              21 Vote for this issue
              Watchers:
              17 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: