Bug 351436

Description Jörg von Frantzius 2011-07-07 08:35:02 EDT

NPE happened when choosing "Edit Conflicts" on a file with conflicts, after an update was made. There already was a compare editor open on that file, showing things like ">>>>>>> .r1078" as differences.

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_24-b07, java.vendor=Sun Microsystems Inc., line.separator= , java.class.version=50.0, os.name=Linux, os.arch=i386, user.country=DE, os.version=2.6.38-8-generic-pae, eclipse.commands=-os linux -ws gtk -arch x86 -showsplash /home/jfrantzius/apps/eclipse-jee-indigo/eclipse//plugins/org.eclipse.platform_3.7.0.v201106131736/splash.bmp -launcher /home/jfrantzius/apps/eclipse-jee-indigo/eclipse/eclipse -name Eclipse --launcher.library /home/jfrantzius/apps/eclipse-jee-indigo/eclipse//plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.100.v20110505/eclipse_1407.so -startup /home/jfrantzius/apps/eclipse-jee-indigo/eclipse//plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar --launcher.overrideVmargs -product org.eclipse.epp.package.jee.product -data /home/jfrantzius/eclipse_workspaces/mbc_relaunch -vm /usr/lib/jvm/java-6-sun-1.6.0.24/jre/bin/../lib/i386/client/libjvm.so , java.version=1.6.0_24, osgi.framework.version=3.7.0.v20110613, file.separator=/, java.vm.info=mixed mode, sharing, path.separator=:, user.timezone=Europe/Berlin, user.language=de, java.vm.name=Java HotSpot(TM) Client 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.core.utility.ProgressMonitorUtility.doTaskExternal(ProgressMonitorUtility.java:81)
	at org.eclipse.team.svn.ui.synchronize.action.AbstractSynchronizeLogicalModelAction$2$1.run(AbstractSynchronizeLogicalModelAction.java:344)
	at org.eclipse.jface.operation.ModalContext$ModalContextThread.run(ModalContext.java:121)