Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 366164

Summary:	ID-VVAEM
Product:	[Technology] Subversive	Reporter:	Nick Lazarev <nnn_xxx>
Component:	Core	Assignee:	Igor Burilo <igor.burilo>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	a.gurov
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Linux
Whiteboard:

Description Nick Lazarev

2011-12-09 05:07:40 EST

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_21-b06, java.vendor=Sun Microsystems Inc., line.separator= , java.class.version=50.0, os.name=Linux, os.arch=amd64, user.country=RU, os.version=3.0.0-13-generic, eclipse.commands=-os linux -ws gtk -arch x86_64 -showsplash -launcher /opt/eclipse-indigo/eclipse -name Eclipse --launcher.library /opt/eclipse-indigo//plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.100.v20110505/eclipse_1407.so -startup /opt/eclipse-indigo//plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar --launcher.overrideVmargs -exitdata 22c80001 -product org.eclipse.epp.package.jee.product -vm /usr/bin/java , java.version=1.6.0_21, osgi.framework.version=3.7.0.v20110613, file.separator=/, java.vm.info=mixed mode, path.separator=:, user.timezone=Europe/Moscow, user.language=ru, java.vm.name=Java HotSpot(TM) 64-Bit Server VM, file.encoding=UTF-8}

java.lang.NullPointerException
java.lang.NullPointerException
	at org.eclipse.compare.CompareEditorInput.setDirty(CompareEditorInput.java:1088)
	at org.eclipse.team.svn.ui.compare.ConflictingFileEditorInput.prepareInput(ConflictingFileEditorInput.java:87)
	at org.eclipse.compare.CompareEditorInput.run(CompareEditorInput.java:484)
	at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation.openEclipseEditor(ShowConflictEditorOperation.java:158)
	at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation.showEditorFor(ShowConflictEditorOperation.java:135)
	at org.eclipse.team.svn.ui.operation.ShowConflictEditorOperation$1.run(ShowConflictEditorOperation.java:94)
	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.ui.operation.ShowConflictEditorOperation.runImpl(ShowConflictEditorOperation.java:92)
	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.ui.utility.WorkspaceModifyCancellableOperationWrapper.execute(WorkspaceModifyCancellableOperationWrapper.java:58)
	at org.eclipse.ui.actions.WorkspaceModifyOperation$1.run(WorkspaceModifyOperation.java:106)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344)
	at org.eclipse.ui.actions.WorkspaceModifyOperation.run(WorkspaceModifyOperation.java:118)
	at org.eclipse.team.svn.ui.utility.SVNTeamOperationWrapper.run(SVNTeamOperationWrapper.java:35)
	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 Nick Lazarev

2011-12-09 05:12:43 EST

This exception throwed by click on Java file context menu (items "Team"->"Edit Confilicts") of confilcted class

Comment 2 Alexander Gurov

2011-12-09 10:15:28 EST

This is actually the Team component issue, but the latest Subversive version contains the workaround for it. Also the version in the Indigo repository also should have the same workaround.