[BLUEJ-1207] Null pointer exception is raised when a merge conflict happens in a project which has a package
This exception also prevents the merge conflict dialogue to be shown to the user after the user clicks update..
Exception in thread "JavaFX Application Thread" java.lang.NullPointerExceptionException in thread "JavaFX Application Thread" java.lang.NullPointerException at java.util.stream.ForEachOpsForEachOp
OfRef.accept(ForEachOps.java:184) at java.util.stream.ReferencePipeline$31.accept(ReferencePipeline.java:193) at java.util.TreeMap
ValueSpliterator.forEachRemaining(TreeMap.java:2897) at java.util.stream.AbstractPipeline.copyInto(AbstractPipeline.java:481) at java.util.stream.AbstractPipeline.wrapAndCopyInto(AbstractPipeline.java:471) at java.util.stream.ForEachOpsForEachOp.evaluateSequential(ForEachOps.java:151) at java.util.stream.ForEachOps
ForEachOpOfRef.evaluateSequential(ForEachOps.java:174) at java.util.stream.AbstractPipeline.evaluate(AbstractPipeline.java:234) at java.util.stream.ReferencePipeline.forEach(ReferencePipeline.java:418) at bluej.pkgmgr.Project.clearAllSelections(Project.java:1476) at bluej.groupwork.actions.UpdateAction
UpdateWorker.handleConflicts(UpdateAction.java:399) at bluej.groupwork.git.GitUpdateToCommand.lambda$getResult6(GitUpdateToCommand.java:200) at com.sun.javafx.application.PlatformImpl.lambda
null172(PlatformImpl.java:295) at java.security.AccessController.doPrivileged(Native Method) at com.sun.javafx.application.PlatformImpl.lambda
runLater173(PlatformImpl.java:294) at com.sun.glass.ui.InvokeLaterDispatcher
Future.run(InvokeLaterDispatcher.java:95) at com.sun.glass.ui.win.WinApplication._runLoop(Native Method) at com.sun.glass.ui.win.WinApplication.lambda$null$147(WinApplication.java:177) at java.lang.Thread.run(Thread.java:748)
Issue metadata
- Issue type: Bug
- Priority: Medium
- Fix versions: 4.1.3