Bug 353710

Description Gerbrand van Dieijen 2011-08-03 05:00:08 EDT

- Synchronize Perspective, for Subversion
- Update all incoming changes
- Edit Conflicts for (Java) file in conflict
- I get NPE

Happens until now for all files. Most likely a combination of plugins. I've installed JBoss tools and Eclipse tools and a few other plugins (if you need more information you can mail me at gerbrand AT vandieijen.nl). Previously I've instaled Scala IDE plugin, but I've deinstalled it.

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-384-10M3425, java.vendor=Apple Inc., line.separator= , java.class.version=50.0, os.name=Mac OS X, os.arch=x86_64, user.country=NL, os.version=10.6.8, eclipse.commands=-os macosx -ws cocoa -arch x86_64 -showsplash -launcher /Applications/eclipse/Eclipse.app/Contents/MacOS/eclipse -name Eclipse --launcher.library /Applications/eclipse/Eclipse.app/Contents/MacOS//../../../plugins/org.eclipse.equinox.launcher.cocoa.macosx.x86_64_1.1.100.v20110502/eclipse_1406.so -startup /Applications/eclipse/Eclipse.app/Contents/MacOS//../../../plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar --launcher.overrideVmargs -product org.eclipse.epp.package.jee.product -keyring /Users/gerbrand/.eclipse_keyring -showlocation -vm /System/Library/Frameworks/JavaVM.framework , 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/Amsterdam, user.language=nl, java.vm.name=Java HotSpot(TM) 64-Bit Server VM, file.encoding=MacRoman}

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)