Login | Register
My pages Projects Community openCollabNet

Discussions > issues > [Issue 1439] New - Edit conflicts causes NPE wih either built-in and external merge client

subclipse
Discussion topic

Back to topic list

[Issue 1439] New - Edit conflicts causes NPE wih either built-in and external merge client

Author michael_o
Full name Michael Osipov
Date 2012-07-31 03:17:13 PDT
Message http://subclipse.tig​ris.org/issues/show_​bug.cgi?id=1439
                 Issue #|1439
                 Summary|Edit conflicts causes NPE wih either built-in and exte
                        |rnal merge client
               Component|subclipse
                 Version|1.8.x
                Platform|SVNKit
              OS/Version|All
                     URL|
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|core
             Assigned to|issues@subclipse
             Reported by|michael_o






------- Additional comments from michael_o at tigris dot org Tue Jul 31 03:17:13 -0700 2012 -------
I am on:
Version: Juno Release
Build id: 20120614-1722
SVNKit: 1.7.5
Subclipse 1.8.14

When I hit Team > Edit conflicts... I get this:

===

!ENTRY org.eclipse.ui 4 0 2012-07-31 11:34:22.257
!MESSAGE Unhandled event loop exception
!STACK 0
java.lang.NullPointerException
    at
org.tigris.subversio​n.subclipse.ui.actio​ns.EditConflictsActi​on.editConflictsExte​rnal(EditConflictsAc​tion.java:101)
    at
org.tigris.subversio​n.subclipse.ui.actio​ns.EditConflictsActi​on.execute(EditConfl​ictsAction.java:165)​
    at org.tigris.subversio​n.subclipse.ui.actio​ns.SVNAction.run(SVN​Action.java:56)
    at org.eclipse.ui.actio​ns.ActionDelegate.ru​nWithEvent(ActionDel​egate.java:70)
    at org.eclipse.ui.inter​nal.PluginAction.run​WithEvent(PluginActi​on.java:241)
    at
org.eclipse.jface.ac​tion.ActionContribut​ionItem.handleWidget​Selection(ActionCont​ributionItem.java:58​4)
    at
org.eclipse.jface.ac​tion.ActionContribut​ionItem.access$2(Ac​tionContributionItem​.java:501)
    at
org.eclipse.jface.ac​tion.ActionContribut​ionItem$5.handleEve​nt(ActionContributio​nItem.java:411)
    at org.eclipse.swt.widg​ets.EventTable.sendE​vent(EventTable.java​:84)
    at org.eclipse.swt.widg​ets.Widget.sendEvent​(Widget.java:1053)
    at org.eclipse.swt.widg​ets.Display.runDefer​redEvents(Display.ja​va:4169)
    at org.eclipse.swt.widg​ets.Display.readAndD​ispatch(Display.java​:3758)
    at
org.eclipse.e4.ui.in​ternal.workbench.swt​.PartRenderingEngine​$9.run(PartRenderin​gEngine.java:1022)
    at org.eclipse.core.dat​abinding.observable.​Realm.runWithDefault​(Realm.java:332)
    at
org.eclipse.e4.ui.in​ternal.workbench.swt​.PartRenderingEngine​.run(PartRenderingEn​gine.java:916)
    at
org.eclipse.e4.ui.in​ternal.workbench.E4W​orkbench.createAndRu​nUI(E4Workbench.java​:86)
    at org.eclipse.ui.inter​nal.Workbench$5.run​(Workbench.java:585)​
    at org.eclipse.core.dat​abinding.observable.​Realm.runWithDefault​(Realm.java:332)
    at org.eclipse.ui.inter​nal.Workbench.create​AndRunWorkbench(Work​bench.java:540)
    at org.eclipse.ui.Platf​ormUI.createAndRunWo​rkbench(PlatformUI.j​ava:149)
    at
org.eclipse.ui.inter​nal.ide.application.​IDEApplication.start​(IDEApplication.java​:124)
    at org.eclipse.equinox.​internal.app.Eclipse​AppHandle.run(Eclips​eAppHandle.java:196)​
    at
org.eclipse.core.run​time.internal.adapto​r.EclipseAppLauncher​.runApplication(Ecli​pseAppLauncher.java:​110)
    at
org.eclipse.core.run​time.internal.adapto​r.EclipseAppLauncher​.start(EclipseAppLau​ncher.java:79)
    at org.eclipse.core.run​time.adaptor.Eclipse​Starter.run(EclipseS​tarter.java:353)
    at org.eclipse.core.run​time.adaptor.Eclipse​Starter.run(EclipseS​tarter.java:180)
    at sun.reflect.NativeMe​thodAccessorImpl.inv​oke0(Native Method)
    at sun.reflect.NativeMe​thodAccessorImpl.inv​oke(Unknown Source)
    at sun.reflect.Delegati​ngMethodAccessorImpl​.invoke(Unknown Source)
    at java.lang.reflect.Me​thod.invoke(Unknown Source)
    at org.eclipse.equinox.​launcher.Main.invoke​Framework(Main.java:​629)
    at org.eclipse.equinox.​launcher.Main.basicR​un(Main.java:584)
    at org.eclipse.equinox.​launcher.Main.run(Ma​in.java:1438)

!ENTRY org.eclipse.ui 4 0 2012-07-31 11:36:24.659
!MESSAGE Unhandled event loop exception
!STACK 0
java.lang.NullPointerException
    at
org.tigris.subversio​n.subclipse.ui.confl​icts.ConflictsCompar​eInput.initializeCom​pareConfiguration(Co​nflictsCompareInput.​java:121)
    at
org.tigris.subversio​n.subclipse.ui.confl​icts.ConflictsCompar​eInput.setResources(​ConflictsCompareInpu​t.java:104)
    at
org.tigris.subversio​n.subclipse.ui.actio​ns.EditConflictsActi​on.editConflictsInte​rnal(EditConflictsAc​tion.java:69)
    at
org.tigris.subversio​n.subclipse.ui.actio​ns.EditConflictsActi​on.execute(EditConfl​ictsAction.java:158)​
    at org.tigris.subversio​n.subclipse.ui.actio​ns.SVNAction.run(SVN​Action.java:56)
    at org.eclipse.ui.actio​ns.ActionDelegate.ru​nWithEvent(ActionDel​egate.java:70)
    at org.eclipse.ui.inter​nal.PluginAction.run​WithEvent(PluginActi​on.java:241)
    at
org.eclipse.jface.ac​tion.ActionContribut​ionItem.handleWidget​Selection(ActionCont​ributionItem.java:58​4)
    at
org.eclipse.jface.ac​tion.ActionContribut​ionItem.access$2(Ac​tionContributionItem​.java:501)
    at
org.eclipse.jface.ac​tion.ActionContribut​ionItem$5.handleEve​nt(ActionContributio​nItem.java:411)
    at org.eclipse.swt.widg​ets.EventTable.sendE​vent(EventTable.java​:84)
    at org.eclipse.swt.widg​ets.Widget.sendEvent​(Widget.java:1053)
    at org.eclipse.swt.widg​ets.Display.runDefer​redEvents(Display.ja​va:4169)
    at org.eclipse.swt.widg​ets.Display.readAndD​ispatch(Display.java​:3758)
    at
org.eclipse.e4.ui.in​ternal.workbench.swt​.PartRenderingEngine​$9.run(PartRenderin​gEngine.java:1022)
    at org.eclipse.core.dat​abinding.observable.​Realm.runWithDefault​(Realm.java:332)
    at
org.eclipse.e4.ui.in​ternal.workbench.swt​.PartRenderingEngine​.run(PartRenderingEn​gine.java:916)
    at
org.eclipse.e4.ui.in​ternal.workbench.E4W​orkbench.createAndRu​nUI(E4Workbench.java​:86)
    at org.eclipse.ui.inter​nal.Workbench$5.run​(Workbench.java:585)​
    at org.eclipse.core.dat​abinding.observable.​Realm.runWithDefault​(Realm.java:332)
    at org.eclipse.ui.inter​nal.Workbench.create​AndRunWorkbench(Work​bench.java:540)
    at org.eclipse.ui.Platf​ormUI.createAndRunWo​rkbench(PlatformUI.j​ava:149)
    at
org.eclipse.ui.inter​nal.ide.application.​IDEApplication.start​(IDEApplication.java​:124)
    at org.eclipse.equinox.​internal.app.Eclipse​AppHandle.run(Eclips​eAppHandle.java:196)​
    at
org.eclipse.core.run​time.internal.adapto​r.EclipseAppLauncher​.runApplication(Ecli​pseAppLauncher.java:​110)
    at
org.eclipse.core.run​time.internal.adapto​r.EclipseAppLauncher​.start(EclipseAppLau​ncher.java:79)
    at org.eclipse.core.run​time.adaptor.Eclipse​Starter.run(EclipseS​tarter.java:353)
    at org.eclipse.core.run​time.adaptor.Eclipse​Starter.run(EclipseS​tarter.java:180)
    at sun.reflect.NativeMe​thodAccessorImpl.inv​oke0(Native Method)
    at sun.reflect.NativeMe​thodAccessorImpl.inv​oke(Unknown Source)
    at sun.reflect.Delegati​ngMethodAccessorImpl​.invoke(Unknown Source)
    at java.lang.reflect.Me​thod.invoke(Unknown Source)
    at org.eclipse.equinox.​launcher.Main.invoke​Framework(Main.java:​629)
    at org.eclipse.equinox.​launcher.Main.basicR​un(Main.java:584)
    at org.eclipse.equinox.​launcher.Main.run(Ma​in.java:1438)
===

« Previous message in topic | 1 of 15 | Next message in topic »

Messages

Show all messages in topic

[Issue 1439] New - Edit conflicts causes NPE wih either built-in and external merge client michael_o Michael Osipov 2012-07-31 03:17:13 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client michael_o Michael Osipov 2012-07-31 03:18:02 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client markphip Mark Phippard 2012-08-07 06:56:17 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client selsemore Stephen Elsemore 2012-08-07 13:19:38 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client michael_o Michael Osipov 2012-08-08 00:39:11 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client selsemore Stephen Elsemore 2012-08-08 06:23:23 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client michael_o Michael Osipov 2012-08-08 06:28:37 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client selsemore Stephen Elsemore 2012-07-31 15:32:00 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client michael_o Michael Osipov 2012-08-06 01:04:45 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client michael_o Michael Osipov 2012-08-06 03:06:07 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client michael_o Michael Osipov 2012-08-06 03:07:44 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client selsemore Stephen Elsemore 2012-08-06 07:59:47 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client michael_o Michael Osipov 2012-08-07 04:27:16 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client markphip Mark Phippard 2012-08-07 05:46:32 PDT
     [Issue 1439] Edit conflicts causes NPE wih either built-in and external merge client michael_o Michael Osipov 2012-08-07 06:32:53 PDT
Messages per page: