/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Sun Nov 10 02:24:38 PST 2013
changeset 85680dbfe7d6 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=85680dbfe7d6
author: Jiri Vanek <jvanek at redhat.com>
date: Sun Nov 10 10:54:03 2013 +0100
Removed suspicious return when (searchForMain) had null launchDesc in netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java.
changeset d6caaf4298af in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d6caaf4298af
author: Jiri Vanek <jvanek at redhat.com>
date: Sun Nov 10 11:30:43 2013 +0100
Fixed lock in awt threads. JavaConsole window is now disposed instead of hidden.
diffstat:
ChangeLog | 17 ++
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 6 +-
netx/net/sourceforge/jnlp/util/logging/JavaConsole.java | 70 ++++++++---
netx/net/sourceforge/jnlp/util/logging/OutputController.java | 4 +-
4 files changed, 72 insertions(+), 25 deletions(-)
diffs (265 lines):
diff -r 630384e150d9 -r d6caaf4298af ChangeLog
--- a/ChangeLog Thu Nov 07 09:59:22 2013 -0500
+++ b/ChangeLog Sun Nov 10 11:30:43 2013 +0100
@@ -1,3 +1,20 @@
+2013-11-10 Jiri Vanek <jvanek at redhat.com>
+
+ Fixed lock in awt threads. JavaConsole window is now disposed instead of hidden.
+ * netx/net/sourceforge/jnlp/util/logging/JavaConsole.java: (lastSize) new
+ global variable to remember last size of window.(contentPanel) moved from
+ local to global scope. (initializeWindow) extracted from (initialize), is
+ handling creation and filling of window. (showConsole) is now initializing
+ window, and (hideConsole) is disposing it. Added override annotations and
+ removed duplicate code.
+ * netx/net/sourceforge/jnlp/util/logging/OutputController.java: messageQueConsumer
+ thread is now named, and its wait, have timeout.
+
+2013-11-10 Jiri Vanek <jvanek at redhat.com>
+
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+ removed suspicious return when (searchForMain) had null launchDesc
+
2013-11-07 Andrew Azores <aazores at redhat.com>
Reproducer test cleanup. Replaced ServerAccess.ProcessResult in favour of
diff -r 630384e150d9 -r d6caaf4298af netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Nov 07 09:59:22 2013 -0500
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Sun Nov 10 11:30:43 2013 +0100
@@ -828,11 +828,9 @@
// Check launch info
if (mainClass == null) {
LaunchDesc launchDesc = file.getLaunchInfo();
- if (launchDesc == null) {
- return;
+ if (launchDesc != null) {
+ mainClass = launchDesc.getMainClass();
}
-
- mainClass = launchDesc.getMainClass();
}
// The main class may be specified in the manifest
diff -r 630384e150d9 -r d6caaf4298af netx/net/sourceforge/jnlp/util/logging/JavaConsole.java
--- a/netx/net/sourceforge/jnlp/util/logging/JavaConsole.java Thu Nov 07 09:59:22 2013 -0500
+++ b/netx/net/sourceforge/jnlp/util/logging/JavaConsole.java Sun Nov 10 11:30:43 2013 +0100
@@ -44,6 +44,8 @@
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -73,6 +75,7 @@
public Map<String, String> getLoaderInfo();
}
private static JavaConsole console;
+ private static Dimension lastSize;
public static JavaConsole getConsole() {
if (console == null) {
@@ -107,12 +110,42 @@
private JDialog consoleWindow;
private JTextArea stdErrText;
private JTextArea stdOutText;
+ private JPanel contentPanel = new JPanel();
private ClassLoaderInfoProvider classLoaderInfoProvider;
public JavaConsole() {
initialize();
}
+
+ private void initializeWindow() {
+ initializeWindow(lastSize, contentPanel);
+ }
+
+ private void initializeWindow(Dimension size, JPanel content) {
+ consoleWindow = new JDialog((JFrame) null, R("DPJavaConsole"));
+ consoleWindow.addWindowListener(new WindowAdapter() {
+
+ @Override
+ public void windowClosed(WindowEvent e) {
+ lastSize=consoleWindow.getSize();
+ }
+
+ });
+ consoleWindow.setIconImages(ImageResources.INSTANCE.getApplicationImages());
+
+ consoleWindow.add(content);
+ consoleWindow.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); //HIDE_ON_CLOSE can cause shut down deadlock
+ consoleWindow.pack();
+ if (size!=null){
+ consoleWindow.setSize(size);
+ } else {
+ consoleWindow.setSize(new Dimension(900, 600));
+ }
+ consoleWindow.setMinimumSize(new Dimension(900, 300));
+
+ }
+
/**
* Initialize the console
*/
@@ -124,10 +157,8 @@
OutputController.getLogger().log(OutputController.Level.ERROR_ALL, e);
}
- consoleWindow = new JDialog((JFrame) null, R("DPJavaConsole"));
- consoleWindow.setIconImages(ImageResources.INSTANCE.getApplicationImages());
- JPanel contentPanel = new JPanel();
+ contentPanel = new JPanel();
contentPanel.setLayout(new GridBagLayout());
GridBagConstraints c;
@@ -174,6 +205,7 @@
buttonPanel.add(gcButton);
gcButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
printMemoryInfo();
OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "Performing Garbage Collection....");
@@ -187,6 +219,7 @@
buttonPanel.add(finalizersButton);
finalizersButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
printMemoryInfo();
OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, R("CONSOLErunningFinalizers"));
@@ -200,6 +233,7 @@
buttonPanel.add(memoryButton);
memoryButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
printMemoryInfo();
}
@@ -209,6 +243,7 @@
buttonPanel.add(systemPropertiesButton);
systemPropertiesButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
printSystemProperties();
}
@@ -218,6 +253,7 @@
buttonPanel.add(classloadersButton);
classloadersButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
printClassLoaders();
}
@@ -227,6 +263,7 @@
buttonPanel.add(threadListButton);
threadListButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
printThreadInfo();
}
@@ -236,9 +273,11 @@
buttonPanel.add(closeButton);
closeButton.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
hideConsole();
}
@@ -246,12 +285,6 @@
}
});
- consoleWindow.add(contentPanel);
- consoleWindow.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
- consoleWindow.pack();
- consoleWindow.setSize(new Dimension(900, 600));
- consoleWindow.setMinimumSize(new Dimension(900, 300));
-
splitPane.setDividerLocation(0.5);
splitPane.setResizeWeight(0.5);
}
@@ -260,25 +293,28 @@
showConsole(false);
}
- public void showConsole(boolean b) {
- consoleWindow.setModal(b);
+ public void showConsole(boolean modal) {
+ initializeWindow();
+ consoleWindow.setModal(modal);
consoleWindow.setVisible(true);
}
public void hideConsole() {
consoleWindow.setModal(false);
consoleWindow.setVisible(false);
+ consoleWindow.dispose();
}
public void showConsoleLater() {
showConsoleLater(false);
}
- public void showConsoleLater(final boolean b) {
+ public void showConsoleLater(final boolean modal) {
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
- JavaConsole.getConsole().showConsole(b);
+ JavaConsole.getConsole().showConsole(modal);
}
});
}
@@ -286,6 +322,7 @@
public void hideConsoleLater() {
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
JavaConsole.getConsole().hideConsole();
}
@@ -364,12 +401,7 @@
}
if (toShowConsole) {
- SwingUtilities.invokeLater(new Runnable() {
-
- public void run() {
- console.showConsole();
- }
- });
+ console.showConsoleLater();
}
}
diff -r 630384e150d9 -r d6caaf4298af netx/net/sourceforge/jnlp/util/logging/OutputController.java
--- a/netx/net/sourceforge/jnlp/util/logging/OutputController.java Thu Nov 07 09:59:22 2013 -0500
+++ b/netx/net/sourceforge/jnlp/util/logging/OutputController.java Sun Nov 10 11:30:43 2013 +0100
@@ -102,7 +102,7 @@
while (true) {
try {
synchronized (OutputController.this) {
- OutputController.this.wait();
+ OutputController.this.wait(1000);
if (!(OutputController.this == null || messageQue.isEmpty())) {
flush();
}
@@ -199,7 +199,7 @@
outLog = new PrintStreamLogger(out);
errLog = new PrintStreamLogger(err);
//itw logger have to be fully initialised before start
- Thread t = new Thread(messageQueConsumer);
+ Thread t = new Thread(messageQueConsumer, "Output controller consumer daemon");
t.setDaemon(true);
t.start();
//some messages were probably posted before start of consumer
More information about the distro-pkg-dev
mailing list