Changeset 436 for trunk/icedtea-web/netx

Timestamp:

Oct 15, 2014, 10:44:36 AM (11 years ago)

Author:

dmik

Message:

icedtea-web: Use unnamed pipe instead of unix-style named pipe for debug console.

Similar to r368.

File:

• trunk/icedtea-web/netx/net/sourceforge/jnlp/util/logging/JavaConsole.java (modified) (3 diffs)

trunk/icedtea-web/netx/net/sourceforge/jnlp/util/logging/JavaConsole.java

@@ -51 +51 @@
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.nio.charset.Charset;
@@ -535 +536 @@
     }
 
-    public void createPluginReader(final File file) {
-        OutputController.getLogger().log("Starting processing of plugin-debug-to-console " + file.getAbsolutePath());
+    public void createPluginReader(final InputStream inputstream) {
+        OutputController.getLogger().log("Starting processing of plugin-debug-to-console " + inputstream);
         Thread t = new Thread(new Runnable() {
 
             @Override
             public void run() {
+                OutputController.getLogger().log("Started processing of plugin-debug-to-console " + inputstream);
                 BufferedReader br = null;
                 try {
-                    br = new BufferedReader(new InputStreamReader(new FileInputStream(file),
+                    br = new BufferedReader(new InputStreamReader(inputstream,
                             Charset.forName("UTF-8")));
                     //never ending loop
@@ -567 +569 @@
                     }
                 }
-                OutputController.getLogger().log("Ended processing of plugin-debug-to-console " + file.getAbsolutePath());
+                OutputController.getLogger().log("Ended processing of plugin-debug-to-console " + inputstream);
             }
         }, "plugin-debug-to-console reader thread");
         t.setDaemon(true);
         t.start();
-
-        OutputController.getLogger().log("Started processing of plugin-debug-to-console " + file.getAbsolutePath());
+    }
+
+    public void createPluginReader(final File file) {
+        OutputController.getLogger().log("Starting processing of plugin-debug-to-console " + file.getAbsolutePath());
+        try {
+            createPluginReader(new FileInputStream(file));
+        } catch (Exception ex) {
+            OutputController.getLogger().log(ex);
+        }
     }
 }