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 69616 - Deadlock while watching differences after applying diff patch.
Summary: Deadlock while watching differences after applying diff patch.
Status: VERIFIED FIXED
Alias: None
Product: utilities
Classification: Unclassified
Component: Diff (show other bugs)
Version: 5.x
Hardware: All All
: P2 blocker (vote)
Assignee: diff-issues@utilities
URL:
Keywords:
Depends on:
Blocks: 69579
  Show dependency tree
 
Reported: 2005-11-30 13:41 UTC by Peter Pis
Modified: 2005-12-07 08:36 UTC (History)
1 user (show)

See Also:
Issue Type: DEFECT
Exception Reporter:


Attachments
thread dump (14.62 KB, text/plain)
2005-11-30 13:41 UTC, Peter Pis
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Peter Pis 2005-11-30 13:41:37 UTC
Product Version         = NetBeans IDE Dev (Build 200511291900)
Operating System        = Windows XP version 5.1 running on x86
Java; VM; Vendor; Home  = 1.5.0_05; Java HotSpot(TM) Client VM 1.5.0_05-b05; Sun
Microsystems Inc.; d:\Java\jdk1.5.0_05

Steps:
1. Modify some files that are in project under source control.
2. Select project root and invoke "CVS | Export Diff Patch" main menu action.
3. Select project root and invoke "CVS | Revert Modifications" popup menu action.
4. Switch to "Files" view and invoke "Tools | Apply Diff Patch" popup menu action.
5. Tabs are opened into the editor area.
6. Choose "Textual output".
7. Choose "Command line diff engine".

Deadlock occurs.
Comment 1 Peter Pis 2005-11-30 13:41:56 UTC
Created attachment 27435 [details]
thread dump
Comment 2 Peter Pis 2005-11-30 13:48:06 UTC
Raising priority to P1. It's reproducible.
Comment 3 Peter Pis 2005-11-30 14:02:50 UTC
Next Q-Build stopper. (200511291900)
Comment 4 _ pkuzel 2005-11-30 14:05:30 UTC
It's not deadlock. An external program supplies infinite data stream.
I'll add diagnotic message what external program was actually executed.

It should be moved away from AWT.
Comment 5 Peter Pis 2005-11-30 14:52:05 UTC
It is "Next" Q-Build stopper. (200511291900) Not for today ;)
Comment 6 _ pkuzel 2005-11-30 15:01:05 UTC
Diagnostics message into ide.log.

Checking in CmdlineDiffProvider.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/cmdline/CmdlineDiffProvider.java,v
 <--  CmdlineDiffProvider.java
new revision: 1.15; previous revision: 1.14
done
Comment 7 _ pkuzel 2005-12-05 15:45:46 UTC
Interruptible wrapper over Runtime.exec().
Asynchronous (non-AWT) diff computation.

Checking in Bundle.properties;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/Bundle.properties,v
 <--  Bundle.properties
new revision: 1.24; previous revision: 1.23
done
Checking in DiffAction.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/DiffAction.java,v
 <--  DiffAction.java
new revision: 1.32; previous revision: 1.31
done
Checking in builtin/Bundle.properties;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/builtin/Bundle.properties,v
 <--  Bundle.properties
new revision: 1.12; previous revision: 1.11
done
Checking in builtin/DiffPresenter.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/builtin/DiffPresenter.java,v
 <--  DiffPresenter.java
new revision: 1.23; previous revision: 1.22
done
Checking in cmdline/CmdlineDiffProvider.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/cmdline/CmdlineDiffProvider.java,v
 <--  CmdlineDiffProvider.java
new revision: 1.16; previous revision: 1.15
done
Comment 8 Peter Pis 2005-12-06 12:49:09 UTC
Reopen -> Now the process is running endless again. Moreover it can't be
stopped. (NB200512051900).
Comment 9 _ pkuzel 2005-12-06 14:59:42 UTC
 - lazy diff computing on open
 - default external command changed to use "-wrapped arguments
 - autocancel on window close

Checking in DiffAction.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/DiffAction.java,v
 <--  DiffAction.java
new revision: 1.33; previous revision: 1.32
done
Checking in builtin/DiffPresenter.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/builtin/DiffPresenter.java,v
 <--  DiffPresenter.java
new revision: 1.24; previous revision: 1.23
done
Checking in cmdline/CmdlineDiffProvider.java;
/shared/data/ccvs/repository/diff/src/org/netbeans/modules/diff/cmdline/CmdlineDiffProvider.java,v
 <--  CmdlineDiffProvider.java
new revision: 1.17; previous revision: 1.16
done
Comment 10 Peter Pis 2005-12-07 08:36:03 UTC
Verified. (NB200512061900).