Bug 350207

Description Gabriel Sjoberg 2011-06-23 22:25:12 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_25-b06, java.vendor=Sun Microsystems Inc., line.separator=
 , java.class.version=50.0, os.name=Windows 7, os.arch=amd64, user.country=US, os.version=6.1, eclipse.commands=-os win32 -ws win32 -arch x86_64 -showsplash D:\progs\eclipse\\plugins\org.eclipse.platform_3.7.0.v201106131736\splash.bmp -launcher D:\progs\eclipse\eclipse.exe -name Eclipse --launcher.library D:\progs\eclipse\\plugins/org.eclipse.equinox.launcher.win32.win32.x86_64_1.1.100.v20110502\eclipse_1406.dll -startup D:\progs\eclipse\\plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar --launcher.overrideVmargs -product org.eclipse.epp.package.jee.product -clean -vm C:\Program Files\Java\jdk1.6.0_25\bin\..\jre\bin\server\jvm.dll , java.version=1.6.0_25, osgi.framework.version=3.7.0.v20110613, file.separator=\, java.vm.info=mixed mode, path.separator=;, user.timezone=America/Chicago, user.language=en, java.vm.name=Java HotSpot(TM) 64-Bit Server VM, file.encoding=Cp1252}

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)