no i dont run a custom version of the Mergeclient code.
But it is not a big issue, it only happens once and that is after an upgrade
the first time.. No idea why that is and as i said i cant debug it myself
because it doesnt happen again...
Will see if it happens with the next upgrade to see if your patch worked.
On Wed, Mar 10, 2010 at 16:22, Stephen Elsemore <selsemore_at_collab.net>wrote:
> Hi Johan,
>
> MergeResultsView.java:323 doesn’t seem to match up with a statement where
> this error might occur. Are you running a custom version by any chance?
>
> Regardless, I can see that MergeResultsView.refreshAsync could benefit from
> some null-proofing, which I’ll do.
>
> Thanks,
> Steve
>
>
> On 3/9/10 3:21 AM, "jcompagner" <jcompagner_at_gmail.com> wrote:
>
> it happened now twice to me also with the update of .9 that the first time
> i do a merge after i updated to the latest subclipse i get this error:
>
> java.lang.NullPointerException
> at
> com.collabnet.subversion.merge.views.MergeResultsView.refreshAsync(MergeResultsView.java:323)
> at
> com.collabnet.subversion.merge.MergeOperation.execute(MergeOperation.java:151)
> at
> org.tigris.subversion.subclipse.ui.operations.SVNOperation.run(SVNOperation.java:90)
> at
> org.eclipse.team.internal.ui.actions.JobRunnableContext.run(JobRunnableContext.java:144)
> at
> org.eclipse.team.internal.ui.actions.JobRunnableContext$ResourceJob.runInWorkspace(JobRunnableContext.java:72)
> at
> org.eclipse.core.internal.resources.InternalWorkspaceJob.run(InternalWorkspaceJob.java:38)
> at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)
>
>
> Only 1 time and after that i dont see it anymore.
>
> johan
>
>
> On Mon, Mar 8, 2010 at 22:08, Mark Phippard <markphip_at_gmail.com> wrote:
>
> As I mentioned last week, we noticed that the fix we made for missing
> decorators when the Java Package view is in hierarchical mode caused
> the decorators to refresh slowly. The need for this fix came about as
> a result of some other improvements we were making in the decorator.
> For the time being I decided to back all these changes out and do a
> new release so decorators are back to the way they were and should
> work correctly in hierarchical mode as well as refresh quickly.
>
> It so happens we had made some other fixes since then too, so here is
> the changelog for this release.
>
> Version 1.6.10
> 08 March 2010
>
> from: /trunk
> http://subclipse.tigris.org/svn/subclipse/tags/subclipse/1.6.10
>
> * Revert all decorator improvements made for issue 1073 thus far to
> restore performance of decorators. (1073)
> * Fix peg revision problems in history view compare options. (1109)
> * Fix peg revision problems in history view annotate option. (1109)
> * Fix peg revision problems in history view annotate option. (1114)
> * Fix tree conflict resolution wizard merge/compare browse button to
> bring up folder browser instead of file browser when tree conflict is
> on a folder that does not exist locally. (1111)
>
> Complete changelog online at:
>
> http://subclipse.tigris.org/subclipse_1.6.x/changes.html
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ------------------------------------------------------
>
> http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2456700
>
> To unsubscribe from this discussion, e-mail: [
> users-unsubscribe_at_subclipse.tigris.org].
>
>
>
>
------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2457705
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2010-03-10 17:29:56 CET