 |
History
| Log In
|
|
|
|
Build 5581
Reported by Kevan Dunsmore Error message: No message Previous exception is: http://www.intellij.net/tracker/idea/viewSCR?publicId=73684  There was at least one exception before this one.java.lang.NullPointerException at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.a(DiffRequestFactoryImpl.java:5) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.access$000(DiffRequestFactoryImpl.java:76) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion$1$1.run(DiffRequestFactoryImpl.java:107) at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:105) at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:83) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion$1.run(DiffRequestFactoryImpl.java:105) at com.intellij.openapi.application.impl.ApplicationImpl.runWriteAction(ApplicationImpl.java:711) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.applyText(DiffRequestFactoryImpl.java:103) at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl$MergeContent.applyChanges(MergeRequestImpl.java:137) at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl.applyChanges(MergeRequestImpl.java:59) at com.intellij.openapi.vcs.merge.AbstractMergeAction.resolveFile(AbstractMergeAction.java:141) at com.intellij.openapi.vcs.merge.AbstractMergeAction.execute(AbstractMergeAction.java:103) at com.intellij.openapi.vcs.merge.AbstractMergeAction$2.run(AbstractMergeAction.java:216) at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl$1.run(MergeRequestImpl.java:95) at com.intellij.openapi.ui.DialogBuilder$MyDialogWrapper.doOKAction(DialogBuilder.java:335) at com.intellij.openapi.ui.DialogWrapper$OkAction.actionPerformed(DialogWrapper.java:852) at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) at javax.swing.AbstractButton$Handler.actionPerformed(Unknown Source) at javax.swing.DefaultButtonModel.fireActionPerformed(Unknown Source) at javax.swing.DefaultButtonModel.setPressed(Unknown Source) at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(Unknown Source) at java.awt.Component.processMouseEvent(Unknown Source) at javax.swing.JComponent.processMouseEvent(Unknown Source) at java.awt.Component.processEvent(Unknown Source) at java.awt.Container.processEvent(Unknown Source) at java.awt.Component.dispatchEventImpl(Unknown Source) at java.awt.Container.dispatchEventImpl(Unknown Source) at java.awt.Component.dispatchEvent(Unknown Source) at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) at java.awt.Container.dispatchEventImpl(Unknown Source) at java.awt.Window.dispatchEventImpl(Unknown Source) at java.awt.Component.dispatchEvent(Unknown Source) at java.awt.EventQueue.dispatchEvent(Unknown Source) at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:374) at com.intellij.ide.IdeEventQueue.<unknown>(IdeEventQueue.java:361) at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:274) at java.awt.EventDispatchThread.pumpOneEventForHierarchy(Unknown Source) at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) at java.awt.Dialog$1.run(Unknown Source) at java.awt.Dialog$2.run(Unknown Source) at java.security.AccessController.doPrivileged(Native Method) at java.awt.Dialog.show(Unknown Source) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl$MyDialog.show(DialogWrapperPeerImpl.java:459) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl.show(DialogWrapperPeerImpl.java:304) at com.intellij.openapi.ui.DialogWrapper.show(DialogWrapper.java:745) at com.intellij.openapi.ui.DialogBuilder.showImpl(DialogBuilder.java:66) at com.intellij.openapi.ui.DialogBuilder.show(DialogBuilder.java:46) at com.intellij.openapi.diff.impl.mergeTool.MergeTool.showDialog(MergeTool.java:40) at com.intellij.openapi.diff.impl.mergeTool.MergeTool.show(MergeTool.java:12) at com.intellij.openapi.diff.impl.external.CompositeDiffTool.show(CompositeDiffTool.java:23) at com.intellij.openapi.vcs.merge.AbstractMergeAction.showMergeDialog(AbstractMergeAction.java:192) at com.intellij.openapi.vcs.merge.AbstractMergeAction.showMergeDialogForFile(AbstractMergeAction.java:151) at com.intellij.openapi.vcs.merge.AbstractMergeAction.execute(AbstractMergeAction.java:109) at com.intellij.openapi.vcs.merge.AbstractMergeAction.actionPerformed(AbstractMergeAction.java:89) at com.intellij.openapi.vcs.impl.AbstractVcsHelperImpl.showMergeDialog(AbstractVcsHelperImpl.java:699) at org.jetbrains.idea.svn.update.AbstractSvnUpdateIntegrateEnvironment$1.onRefreshFilesCompleted(AbstractSvnUpdateIntegrateEnvironment.java:92) at com.intellij.openapi.vcs.update.AbstractCommonUpdateAction.actionPerformed(AbstractCommonUpdateAction.java:145) at com.intellij.openapi.vcs.actions.AbstractVcsAction.actionPerformed(AbstractVcsAction.java:113) at com.intellij.openapi.actionSystem.impl.ActionMenuItem$ActionTransmitter.actionPerformed(ActionMenuItem.java:149) at javax.swing.AbstractButton.fireActionPerformed(Unknown Source) at com.intellij.openapi.actionSystem.impl.ActionMenuItem.fireActionPerformed(ActionMenuItem.java:55) at com.intellij.ui.plaf.beg.BegMenuItemUI.<unknown>(BegMenuItemUI.java:474) at com.intellij.ui.plaf.beg.BegMenuItemUI.access$300(BegMenuItemUI.java:164) at com.intellij.ui.plaf.beg.BegMenuItemUI$MyMouseInputHandler.mouseReleased(BegMenuItemUI.java:494) at java.awt.Component.processMouseEvent(Unknown Source) at javax.swing.JComponent.processMouseEvent(Unknown Source) at java.awt.Component.processEvent(Unknown Source) at java.awt.Container.processEvent(Unknown Source) at java.awt.Component.dispatchEventImpl(Unknown Source) at java.awt.Container.dispatchEventImpl(Unknown Source) at java.awt.Component.dispatchEvent(Unknown Source) at java.awt.LightweightDispatcher.retargetMouseEvent(Unknown Source) at java.awt.LightweightDispatcher.processMouseEvent(Unknown Source) at java.awt.LightweightDispatcher.dispatchEvent(Unknown Source) at java.awt.Container.dispatchEventImpl(Unknown Source) at java.awt.Window.dispatchEventImpl(Unknown Source) at java.awt.Component.dispatchEvent(Unknown Source) at java.awt.EventQueue.dispatchEvent(Unknown Source) at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:374) at com.intellij.ide.IdeEventQueue.<unknown>(IdeEventQueue.java:361) at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:274) at java.awt.EventDispatchThread.pumpOneEventForHierarchy(Unknown Source) at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) at java.awt.EventDispatchThread.pumpEvents(Unknown Source) at java.awt.EventDispatchThread.pumpEvents(Unknown Source) at java.awt.EventDispatchThread.run(Unknown Source) Build 5745
Reported by Martijn Stellinga User description: I clicked 'next file' in the file merge dialog after resolving a merge conflict. A dialog popped asking if the merge was succesful, answering 'yes' caused the NPE and returned me to the diff-dialog without switching to the next file to merge. Error message: Error during dispatching of java.awt.event.MouseEvent[MOUSE_RELEASED,(1039,969),button=1,modifiers=Button1,clickCount=1] on dialog13 java.lang.NullPointerException at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.storeChangedContent(DiffRequestFactoryImpl.java:117) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.access$000(DiffRequestFactoryImpl.java:76) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion$1$1.run(DiffRequestFactoryImpl.java:107) at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:105) at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:83) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion$1.run(DiffRequestFactoryImpl.java:105) at com.intellij.openapi.application.impl.ApplicationImpl.runWriteAction(ApplicationImpl.java:726) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.applyText(DiffRequestFactoryImpl.java:103) at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl$MergeContent.applyChanges(MergeRequestImpl.java:137) at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl.applyChanges(MergeRequestImpl.java:59) at com.intellij.openapi.vcs.merge.AbstractMergeAction.resolveFile(AbstractMergeAction.java:141) at com.intellij.openapi.vcs.merge.AbstractMergeAction.execute(AbstractMergeAction.java:103) at com.intellij.openapi.vcs.merge.AbstractMergeAction$2.run(AbstractMergeAction.java:216) at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl$1.run(MergeRequestImpl.java:95) at com.intellij.openapi.ui.DialogBuilder$MyDialogWrapper.doOKAction(DialogBuilder.java:335) at com.intellij.openapi.ui.DialogWrapper$OkAction.actionPerformed(DialogWrapper.java:855) at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:1849) at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2169) at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:420) at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:258) at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(BasicButtonListener.java:236) at java.awt.Component.processMouseEvent(Component.java:5488) at javax.swing.JComponent.processMouseEvent(JComponent.java:3126) at java.awt.Component.processEvent(Component.java:5253) at java.awt.Container.processEvent(Container.java:1966) at java.awt.Component.dispatchEventImpl(Component.java:3955) at java.awt.Container.dispatchEventImpl(Container.java:2024) at java.awt.Component.dispatchEvent(Component.java:3803) at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4212) at java.awt.LightweightDispatcher.processMouseEvent(Container.java:3892) at java.awt.LightweightDispatcher.dispatchEvent(Container.java:3822) at java.awt.Container.dispatchEventImpl(Container.java:2010) at java.awt.Window.dispatchEventImpl(Window.java:1778) at java.awt.Component.dispatchEvent(Component.java:3803) at java.awt.EventQueue.dispatchEvent(EventQueue.java:463) at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:374) at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:361) at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:274) at java.awt.EventDispatchThread.pumpOneEventForHierarchy(EventDispatchThread.java:242) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:163) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:153) at java.awt.Dialog$1.run(Dialog.java:517) at java.awt.Dialog$2.run(Dialog.java:545) at java.security.AccessController.doPrivileged(Native Method) at java.awt.Dialog.show(Dialog.java:543) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl$MyDialog.show(DialogWrapperPeerImpl.java:488) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl.show(DialogWrapperPeerImpl.java:306) at com.intellij.openapi.ui.DialogWrapper.show(DialogWrapper.java:748) at com.intellij.openapi.ui.DialogBuilder.showImpl(DialogBuilder.java:66) at com.intellij.openapi.ui.DialogBuilder.show(DialogBuilder.java:46) at com.intellij.openapi.diff.impl.mergeTool.MergeTool.showDialog(MergeTool.java:40) at com.intellij.openapi.diff.impl.mergeTool.MergeTool.show(MergeTool.java:12) at com.intellij.openapi.diff.impl.external.CompositeDiffTool.show(CompositeDiffTool.java:23) at com.intellij.openapi.vcs.merge.AbstractMergeAction.showMergeDialog(AbstractMergeAction.java:192) at com.intellij.openapi.vcs.merge.AbstractMergeAction.showMergeDialogForFile(AbstractMergeAction.java:151) at com.intellij.openapi.vcs.merge.AbstractMergeAction.execute(AbstractMergeAction.java:109) at com.intellij.openapi.vcs.merge.AbstractMergeAction.actionPerformed(AbstractMergeAction.java:89) at com.intellij.openapi.vcs.impl.AbstractVcsHelperImpl.showMergeDialog(AbstractVcsHelperImpl.java:760) at com.intellij.cvsSupport2.CvsUpdateEnvironment.invokeManualMerging(CvsUpdateEnvironment.java:150) at com.intellij.cvsSupport2.CvsUpdateEnvironment.access$100(CvsUpdateEnvironment.java:60) at com.intellij.cvsSupport2.CvsUpdateEnvironment$2.onRefreshFilesCompleted(CvsUpdateEnvironment.java:107) at com.intellij.openapi.vcs.update.AbstractCommonUpdateAction$2.run(AbstractCommonUpdateAction.java:147) at com.intellij.openapi.application.impl.LaterInvocator$FlushQueue.run(LaterInvocator.java:216) at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:209) at java.awt.EventQueue.dispatchEvent(EventQueue.java:461) at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:374) at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:365) at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:274) at java.awt.EventDispatchThread.pumpOneEventForHierarchy(EventDispatchThread.java:242) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:163) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:153) at java.awt.Dialog$1.run(Dialog.java:517) at java.awt.Dialog$2.run(Dialog.java:545) at java.security.AccessController.doPrivileged(Native Method) at java.awt.Dialog.show(Dialog.java:543) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl$MyDialog.show(DialogWrapperPeerImpl.java:488) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl.show(DialogWrapperPeerImpl.java:306) at com.intellij.openapi.ui.DialogWrapper.show(DialogWrapper.java:748) at com.intellij.openapi.progress.util.ProgressWindow$MyDialog.show(ProgressWindow.java:467) at com.intellij.openapi.progress.util.ProgressWindow.showDialog(ProgressWindow.java:159) at com.intellij.find.BackgroundableProcessIndicator.showDialog(BackgroundableProcessIndicator.java:50) at com.intellij.openapi.progress.util.ProgressWindow$1$1.run(ProgressWindow.java:107) at com.intellij.util.Alarm$1.run(Alarm.java:106) at com.intellij.util.Alarm$MyThread$1.run(Alarm.java:250) at com.intellij.openapi.application.impl.LaterInvocator$FlushQueue.run(LaterInvocator.java:216) at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:209) at java.awt.EventQueue.dispatchEvent(EventQueue.java:461) at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:374) at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:365) at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:274) at java.awt.EventDispatchThread.pumpOneEventForHierarchy(EventDispatchThread.java:242) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:163) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:157) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:149) at java.awt.EventDispatchThread.run(EventDispatchThread.java:110) Build 5613
Reported by Anonymous IDEA User !!! not unscrambled: C:\Builds\5613\logs\zkm5613.log (The system cannot find the file specified) Error message: No message Previous exception is: http://www.intellij.net/tracker/idea/viewSCR?publicId=78587 There was at least one exception before this one. java.lang.NullPointerException Build 5613
Reported by Anonymous IDEA User !!! not unscrambled: C:\Builds\5613\logs\zkm5613.log (The system cannot find the file specified) Error message: No message java.lang.NullPointerException Build 6111
Reported by Anonymous IDEA User Error message: Error during dispatching of java.awt.event.MouseEvent[MOUSE_RELEASED,(1340,1136),absolute(1350,1146),button=1,modifiers=Button1,clickCount=1] on dialog0 java.lang.NullPointerException at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.storeChangedContent(DiffRequestFactoryImpl.java:117) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.access$000(DiffRequestFactoryImpl.java:76) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion$1$1.run(DiffRequestFactoryImpl.java:107) at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:105) at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:83) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion$1.run(DiffRequestFactoryImpl.java:105) at com.intellij.openapi.application.impl.ApplicationImpl.runWriteAction(ApplicationImpl.java:731) at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.applyText(DiffRequestFactoryImpl.java:103) at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl$MergeContent.applyChanges(MergeRequestImpl.java:136) at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl.applyChanges(MergeRequestImpl.java:58) at com.intellij.openapi.vcs.merge.AbstractMergeAction.resolveFile(AbstractMergeAction.java:158) at com.intellij.openapi.vcs.merge.AbstractMergeAction.execute(AbstractMergeAction.java:120) at com.intellij.openapi.vcs.merge.AbstractMergeAction$3.run(AbstractMergeAction.java:251) at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl$1.run(MergeRequestImpl.java:94) at com.intellij.openapi.ui.DialogBuilder$MyDialogWrapper.doOKAction(DialogBuilder.java:335) at com.intellij.openapi.ui.DialogWrapper$OkAction.actionPerformed(DialogWrapper.java:856) at javax.swing.AbstractButton.fireActionPerformed(AbstractButton.java:1995) at javax.swing.AbstractButton$Handler.actionPerformed(AbstractButton.java:2318) at javax.swing.DefaultButtonModel.fireActionPerformed(DefaultButtonModel.java:387) at javax.swing.DefaultButtonModel.setPressed(DefaultButtonModel.java:242) at javax.swing.plaf.basic.BasicButtonListener.mouseReleased(BasicButtonListener.java:236) at java.awt.Component.processMouseEvent(Component.java:6038) at javax.swing.JComponent.processMouseEvent(JComponent.java:3260) at java.awt.Component.processEvent(Component.java:5803) at java.awt.Container.processEvent(Container.java:2058) at java.awt.Component.dispatchEventImpl(Component.java:4410) at java.awt.Container.dispatchEventImpl(Container.java:2116) at java.awt.Component.dispatchEvent(Component.java:4240) at java.awt.LightweightDispatcher.retargetMouseEvent(Container.java:4322) at java.awt.LightweightDispatcher.processMouseEvent(Container.java:3986) at java.awt.LightweightDispatcher.dispatchEvent(Container.java:3916) at java.awt.Container.dispatchEventImpl(Container.java:2102) at java.awt.Window.dispatchEventImpl(Window.java:2429) at java.awt.Component.dispatchEvent(Component.java:4240) at java.awt.EventQueue.dispatchEvent(EventQueue.java:599) at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:357) at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:347) at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:260) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:273) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:183) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:177) at java.awt.Dialog$1.run(Dialog.java:1039) at java.awt.Dialog$3.run(Dialog.java:1091) at java.security.AccessController.doPrivileged(Native Method) at java.awt.Dialog.show(Dialog.java:1089) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl$MyDialog.show(DialogWrapperPeerImpl.java:490) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl.show(DialogWrapperPeerImpl.java:306) at com.intellij.openapi.ui.DialogWrapper.show(DialogWrapper.java:748) at com.intellij.openapi.ui.DialogBuilder.showImpl(DialogBuilder.java:66) at com.intellij.openapi.ui.DialogBuilder.show(DialogBuilder.java:46) at com.intellij.openapi.diff.impl.mergeTool.MergeTool.showDialog(MergeTool.java:40) at com.intellij.openapi.diff.impl.mergeTool.MergeTool.show(MergeTool.java:12) at com.intellij.openapi.diff.impl.external.CompositeDiffTool.show(CompositeDiffTool.java:23) at com.intellij.openapi.vcs.merge.AbstractMergeAction.showMergeDialog(AbstractMergeAction.java:209) at com.intellij.openapi.vcs.merge.AbstractMergeAction.showMergeDialogForFile(AbstractMergeAction.java:168) at com.intellij.openapi.vcs.merge.AbstractMergeAction.execute(AbstractMergeAction.java:126) at com.intellij.openapi.vcs.merge.AbstractMergeAction.actionPerformed(AbstractMergeAction.java:106) at com.intellij.openapi.vcs.impl.AbstractVcsHelperImpl.showMergeDialog(AbstractVcsHelperImpl.java:755) at com.intellij.cvsSupport2.CvsUpdateEnvironment.invokeManualMerging(CvsUpdateEnvironment.java:150) at com.intellij.cvsSupport2.CvsUpdateEnvironment.access$100(CvsUpdateEnvironment.java:60) at com.intellij.cvsSupport2.CvsUpdateEnvironment$2.onRefreshFilesCompleted(CvsUpdateEnvironment.java:107) at com.intellij.openapi.vcs.update.AbstractCommonUpdateAction$2.run(AbstractCommonUpdateAction.java:141) at com.intellij.openapi.application.impl.LaterInvocator$FlushQueue.run(LaterInvocator.java:222) at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:209) at java.awt.EventQueue.dispatchEvent(EventQueue.java:597) at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:357) at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:351) at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:260) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:273) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:183) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:177) at java.awt.Dialog$1.run(Dialog.java:1039) at java.awt.Dialog$3.run(Dialog.java:1091) at java.security.AccessController.doPrivileged(Native Method) at java.awt.Dialog.show(Dialog.java:1089) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl$MyDialog.show(DialogWrapperPeerImpl.java:490) at com.intellij.openapi.ui.impl.DialogWrapperPeerImpl.show(DialogWrapperPeerImpl.java:306) at com.intellij.openapi.ui.DialogWrapper.show(DialogWrapper.java:748) at com.intellij.openapi.progress.util.ProgressWindow$MyDialog.show(ProgressWindow.java:467) at com.intellij.openapi.progress.util.ProgressWindow.showDialog(ProgressWindow.java:159) at com.intellij.find.BackgroundableProcessIndicator.showDialog(BackgroundableProcessIndicator.java:50) at com.intellij.openapi.progress.util.ProgressWindow$1$1.run(ProgressWindow.java:107) at com.intellij.util.Alarm$1.run(Alarm.java:106) at com.intellij.util.Alarm$MyThread$1.run(Alarm.java:250) at com.intellij.openapi.application.impl.LaterInvocator$FlushQueue.run(LaterInvocator.java:222) at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:209) at java.awt.EventQueue.dispatchEvent(EventQueue.java:597) at com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.java:357) at com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.java:351) at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:260) at java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:273) at java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:183) at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:173) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:168) at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:160) at java.awt.EventDispatchThread.run(EventDispatchThread.java:121) |
|||||||||||||||||||||||||||||||||||||||||||||
 |
|
Exception
Reopened
Major
[#2586] NPE: DiffRequestFactoryImpl$MyMergeVersion.a
Reported by Marcus Brito
!!! not unscrambled - can't locate build #5622
Error message: No message
java.lang.NullPointerException
at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.a(DiffRequestFactoryImpl.java:5)
at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.access$000(DiffRequestFactoryImpl.java:13)
at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion$1$1.run(DiffRequestFactoryImpl.java:2)
at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:77)
at com.intellij.openapi.command.impl.CommandProcessorImpl.executeCommand(CommandProcessorImpl.java:127)
at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion$1.run(DiffRequestFactoryImpl.java:2)
at com.intellij.openapi.application.impl.ApplicationImpl.runWriteAction(ApplicationImpl.java:56)
at com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl$MyMergeVersion.applyText(DiffRequestFactoryImpl.java:8)
at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl$MergeContent.applyChanges(MergeRequestImpl.java:1)
at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl.applyChanges(MergeRequestImpl.java:25)
at com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl.setResult(MergeRequestImpl.java:22)
at com.intellij.openapi.diff.impl.mergeTool.MergeTool.a(MergeTool.java:25)
at com.intellij.openapi.diff.impl.mergeTool.MergeTool.show(MergeTool.java:24)
at com.intellij.openapi.diff.impl.external.CompositeDiffTool.show(CompositeDiffTool.java:7)
at com.intellij.openapi.vcs.merge.AbstractMergeAction.a(AbstractMergeAction.java:36)
at com.intellij.openapi.vcs.merge.AbstractMergeAction.a(AbstractMergeAction.java:0)
at com.intellij.openapi.vcs.merge.AbstractMergeAction.execute(AbstractMergeAction.java:17)
at com.intellij.openapi.vcs.merge.AbstractMergeAction.actionPerformed(AbstractMergeAction.java:87)
at com.intellij.openapi.vcs.impl.AbstractVcsHelperImpl.showMergeDialog(AbstractVcsHelperImpl.java:103)
at org.jetbrains.idea.svn.update.AbstractSvnUpdateIntegrateEnvironment$1.onRefreshFilesCompleted(AbstractSvnUpdateIntegrateEnvironment.java:92)
at com.intellij.openapi.vcs.update.AbstractCommonUpdateAction.actionPerformed(AbstractCommonUpdateAction.java:55)
at com.intellij.openapi.vcs.actions.AbstractVcsAction.actionPerformed(AbstractVcsAction.java:5)
at com.intellij.openapi.keymap.impl.IdeKeyEventDispatcher.a(IdeKeyEventDispatcher.java:196)
at com.intellij.openapi.keymap.impl.IdeKeyEventDispatcher.b(IdeKeyEventDispatcher.java:182)
at com.intellij.openapi.keymap.impl.IdeKeyEventDispatcher.dispatchKeyEvent(IdeKeyEventDispatcher.java:89)
at com.intellij.ide.IdeEventQueue.a(IdeEventQueue.java:125)
at com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.java:188)
at java.awt.EventDispatchThread.pumpOneEventForHierarchy(EventDispatchThread.java:269)
at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:190)
at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:184)
at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:176)
at java.awt.EventDispatchThread.run(EventDispatchThread.java:110)