Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 357104 - NPE in MarkAsMergedOperation [ID-WZ3PP]
Summary: NPE in MarkAsMergedOperation [ID-WZ3PP]
Status: RESOLVED FIXED
Alias: None
Product: Subversive
Classification: Technology
Component: Core (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Igor Burilo CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-09-08 11:02 EDT by Andre Boehlke CLA
Modified: 2011-09-11 03:17 EDT (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Andre Boehlke CLA 2011-09-08 11:02:50 EDT
Version:	0.7.9.I20110523-1700

SVN Client:	org.eclipse.team.svn.connector.svnkit16 2.2.2.I20110523-1700 SVN/1.6.15 SVNKit/1.3.5 (http://svnkit.com/) r7406

JVM Properties:
{java.runtime.name=Java(TM) SE Runtime Environment, java.runtime.version=1.6.0_26-b03, java.vendor=Sun Microsystems Inc., line.separator= , java.class.version=50.0, os.name=Linux, os.arch=amd64, user.country=US, os.version=2.6.38-11-generic, eclipse.commands=-os linux -ws gtk -arch x86_64 -showsplash -launcher /home/boehlke/eclipse_rcp/eclipse -name Eclipse --launcher.library /home/boehlke/eclipse_rcp//plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.100.v20110505/eclipse_1407.so -startup /home/boehlke/eclipse_rcp//plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar --launcher.overrideVmargs -exitdata e8017 -product org.eclipse.epp.package.rcp.product -vm /usr/bin/java , java.version=1.6.0_26, osgi.framework.version=3.7.0.v20110613, file.separator=/, java.vm.info=mixed mode, path.separator=:, user.timezone=Europe/Berlin, user.language=en, java.vm.name=Java HotSpot(TM) 64-Bit Server VM, file.encoding=UTF-8}

java.lang.NullPointerException
java.lang.NullPointerException
	at org.eclipse.team.svn.core.operation.local.MarkAsMergedOperation.getRevisionToUpdate(MarkAsMergedOperation.java:186)
	at org.eclipse.team.svn.core.operation.local.MarkAsMergedOperation.markDeleted(MarkAsMergedOperation.java:126)
	at org.eclipse.team.svn.core.operation.local.MarkAsMergedOperation$1.run(MarkAsMergedOperation.java:104)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doSubTask(ProgressMonitorUtility.java:118)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:154)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.protectStep(AbstractActionOperation.java:149)
	at org.eclipse.team.svn.core.operation.local.MarkAsMergedOperation.runImpl(MarkAsMergedOperation.java:100)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:81)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTask(ProgressMonitorUtility.java:104)
	at org.eclipse.team.svn.core.operation.CompositeOperation.runImpl(CompositeOperation.java:95)
	at org.eclipse.team.svn.core.operation.AbstractActionOperation.run(AbstractActionOperation.java:81)
	at org.eclipse.team.svn.core.operation.LoggedOperation.run(LoggedOperation.java:39)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTask(ProgressMonitorUtility.java:104)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:90)
	at org.eclipse.team.svn.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:81)
	at org.eclipse.team.svn.ui.mapping.UpdateSubscriberContext.markAsMerged(UpdateSubscriberContext.java:286)
	at org.eclipse.team.internal.ui.mapping.ResourceMarkAsMergedHandler$1.markAsMerged(ResourceMarkAsMergedHandler.java:87)
	at org.eclipse.team.internal.ui.mapping.ResourceMarkAsMergedHandler$1.access$0(ResourceMarkAsMergedHandler.java:84)
	at org.eclipse.team.internal.ui.mapping.ResourceMarkAsMergedHandler$2.run(ResourceMarkAsMergedHandler.java:59)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344)
	at org.eclipse.team.core.mapping.provider.MergeContext.run(MergeContext.java:408)
	at org.eclipse.team.internal.ui.mapping.ResourceMarkAsMergedHandler$1.execute(ResourceMarkAsMergedHandler.java:56)
	at org.eclipse.team.ui.mapping.SynchronizationOperation.run(SynchronizationOperation.java:121)
	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:54)
Comment 1 Alexander Gurov CLA 2011-09-11 03:17:02 EDT
Fixed.