Bug 370562

Description Peter 2012-02-03 10:23:21 EST

Version:	0.7.9.I20111123-1700

SVN Client:	org.eclipse.team.svn.connector.svnkit16 2.2.2.I20111119-1700 SVN/1.6.17 SVNKit/1.3.6-v1 (http://svnkit.com/) r7998_v20111004_1436

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=DE, os.version=2.6.35-22-generic, eclipse.commands=-os linux -ws gtk -arch x86_64 -showsplash -launcher /usr/share/eclipse/eclipse -name Eclipse --launcher.library /usr/share/eclipse//plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.100.v20110505/eclipse_1407.so -startup /usr/share/eclipse//plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar --launcher.overrideVmargs -exitdata 288015 -product org.eclipse.epp.package.java.product -vm /usr/bin/java , java.version=1.6.0_26, osgi.framework.version=3.7.1.R37x_v20110808-1106, file.separator=/, java.vm.info=mixed mode, path.separator=:, user.timezone=Europe/Berlin, user.language=de, java.vm.name=Java HotSpot(TM) 64-Bit Server VM, file.encoding=UTF-8}

java.lang.NullPointerException
java.lang.NullPointerException
	at org.polarion.team.svn.connector.svnkit.SVNKitConnector.mergeStatus(SVNKitConnector.java:1196)
	at org.polarion.team.svn.connector.svnkit.SVNKitConnector.mergeStatus(SVNKitConnector.java:1040)
	at org.eclipse.team.svn.core.extension.factory.ThreadNameModifier.mergeStatus(ThreadNameModifier.java:368)
	at org.eclipse.team.svn.core.operation.local.MergeStatusOperation.doMerge1URL(MergeStatusOperation.java:100)
	at org.eclipse.team.svn.core.operation.local.MergeStatusOperation$2.run(MergeStatusOperation.java:69)
	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.MergeStatusOperation.runImpl(MergeStatusOperation.java:66)
	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.synchronize.AbstractSVNSubscriber.findChanges(AbstractSVNSubscriber.java:314)
	at org.eclipse.team.svn.core.synchronize.AbstractSVNSubscriber$UpdateStatusOperation$2.run(AbstractSVNSubscriber.java:349)
	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.synchronize.AbstractSVNSubscriber$UpdateStatusOperation.runImpl(AbstractSVNSubscriber.java:347)
	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.core.synchronize.AbstractSVNSubscriber.refresh(AbstractSVNSubscriber.java:186)
	at org.eclipse.team.svn.core.synchronize.MergeSubscriber.refresh(MergeSubscriber.java:129)
	at org.eclipse.team.internal.ui.synchronize.RefreshSubscriberParticipantJob.doRefresh(RefreshSubscriberParticipantJob.java:116)
	at org.eclipse.team.internal.ui.synchronize.RefreshParticipantJob.run(RefreshParticipantJob.java:309)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)