This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 67658 - [50cat] IAE in "resolve conflicts"
Summary: [50cat] IAE in "resolve conflicts"
Status: VERIFIED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 5.x
Hardware: PC Windows XP
: P2 blocker (vote)
Assignee: issues@versioncontrol
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-10-27 11:01 UTC by wulgar
Modified: 2005-12-21 11:43 UTC (History)
0 users

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description wulgar 2005-10-27 11:01:54 UTC
[ BUILD # : 200510261858 ]
[ JDK VERSION : 1.5.0_05 ]

java.lang.IllegalArgumentException: Parameter file was not normalized. Was C:\DOCUME~1\slawekg\USTAWI~1\Temp\merge13101.java instead of C:\Documents and Settings\slawekg\Ustawienia lokalne\Temp\merge13101.java
	at org.openide.filesystems.FileUtil.toFileObject(FileUtil.java:406)
	at org.netbeans.modules.diff.EncodedReaderFactory.getEncoding(EncodedReaderFactory.java:419)
	at org.netbeans.api.diff.StreamSource$Impl.<init>(StreamSource.java:129)
	at org.netbeans.api.diff.StreamSource.createSource(StreamSource.java:92)
	at org.netbeans.modules.versioning.system.cvss.ui.actions.diff.ResolveConflictsExecutor.handleMergeFor(ResolveConflictsExecutor.java:131)
	at org.netbeans.modules.versioning.system.cvss.ui.actions.diff.ResolveConflictsExecutor.exec(ResolveConflictsExecutor.java:76)
	at org.netbeans.modules.versioning.system.cvss.ui.actions.diff.ResolveConflictsAction.performCvsAction(ResolveConflictsAction.java:73)
	at org.netbeans.modules.versioning.system.cvss.ui.actions.AbstractSystemAction.performAction(AbstractSystemAction.java:63)
	at org.openide.util.actions.NodeAction.performAction(NodeAction.java:255)
	at org.netbeans.modules.versioning.system.cvss.ui.actions.AbstractSystemAction.performAction(AbstractSystemAction.java:89)
	at org.openide.util.actions.CallableSystemAction$1.run(CallableSystemAction.java:94)
	at org.netbeans.modules.openide.util.ActionsBridge.doPerformAction(ActionsBridge.java:47)
	at org.openide.util.actions.CallableSystemAction.actionPerformed(CallableSystemAction.java:90)
	at org.openide.util.actions.NodeAction.actionPerformed(NodeAction.java:244)
	at org.netbeans.modules.versioning.system.cvss.ui.actions.AbstractSystemAction.actionPerformed(AbstractSystemAction.java:84)
	at org.netbeans.modules.versioning.system.cvss.ui.actions.SystemActionBridge.actionPerformed(SystemActionBridge.java:37)
	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.AbstractButton.doClick(AbstractButton.java:302)
	at javax.swing.plaf.basic.BasicMenuItemUI.doClick(BasicMenuItemUI.java:1000)
	at javax.swing.plaf.basic.BasicMenuItemUI$Handler.mouseReleased(BasicMenuItemUI.java:1041)
	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:1774)
	at java.awt.Component.dispatchEvent(Component.java:3803)
[catch] at java.awt.EventQueue.dispatchEvent(EventQueue.java:463)
	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)
Comment 1 Maros Sandor 2005-10-27 13:11:04 UTC
Fixing file normalization.

/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/EncodedReaderFactory.java,v
 <--  EncodedReaderFactory.java
new revision: 1.8; previous revision: 1.7
Comment 2 Peter Pis 2005-11-01 09:32:46 UTC
Reopen. NB 051031.
Comment 3 Maros Sandor 2005-11-01 09:37:13 UTC
Please attach new stacktrace. The original was made obsolete by the patch.
Comment 4 _ pkuzel 2005-11-11 11:04:15 UTC
"Temp", I suspect that File.createTempFile() returns non-normalized files.

Checking in diff/src/org/netbeans/api/diff/StreamSource.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/api/diff/StreamSource.java,v
 <--  StreamSource.java
new revision: 1.6; previous revision: 1.5
done
Checking in diff/src/org/netbeans/modules/diff/cmdline/CmdlineDiffProvider.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/cmdline/CmdlineDiffProvider.java,v
 <--  CmdlineDiffProvider.java
new revision: 1.14; previous revision: 1.13
done
Checking in diff/src/org/netbeans/modules/diff/PatchAction.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/PatchAction.java,v
 <--  PatchAction.java
new revision: 1.34; previous revision: 1.33
done
Checking in
javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/selectors/ModuleSelector.java;
/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/selectors/ModuleSelector.java,v
 <--  ModuleSelector.java
new revision: 1.8; previous revision: 1.7
done
Checking in
javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/diff/ResolveConflictsExecutor.java;
/shared/data/ccvs/repository/javacvs/cvsmodule/src/org/netbeans/modules/versioning/system/cvss/ui/actions/diff/ResolveConflictsExecutor.java,v
 <--  ResolveConflictsExecutor.java
new revision: 1.7; previous revision: 1.6
done
Comment 5 Peter Pis 2005-12-17 07:16:51 UTC
Wulgar, can you verify this issue, please?
Comment 6 wulgar 2005-12-21 11:43:25 UTC
Verified at build 200512202030