Changeset 436 for trunk/icedtea-web/plugin/icedteanp/os2

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/plugin/icedteanp/os2/java/sun/applet/PluginMainBase.java (modified) (3 diffs)

trunk/icedtea-web/plugin/icedteanp/os2/java/sun/applet/PluginMainBase.java

@@ -52 +52 @@
     private static int inPipe = -1;
     private static int outPipe = -1;
+    private static int debugPipe = -1;
 
     static boolean checkArgs(String args[]) {
@@ -60 +61 @@
                 DeploymentConfiguration.move14AndOlderFilesTo15StructureCatched();
                 if (JavaConsole.isEnabled()) {
-                    if ((args.length < 3) || !new File(args[2]).exists()) {
+                    if ((args.length < 3) || (debugPipe = Integer.valueOf(args[2]).intValue()) < 0) {
                         OutputController.getLogger().log(OutputController.Level.ERROR_ALL, "Warning, although console is on, plugin debug connection do not exists. No plugin information will be displayed in console (only java ones).");
-                    } else {
-                        JavaConsole.getConsole().createPluginReader(new File(args[2]));
                     }
                 }
@@ -81 +80 @@
         fdAccess.set(outPipeFD, outPipe);
         streamHandler = new PluginStreamHandler(new FileInputStream(inPipeFD), new FileOutputStream(outPipeFD));
+        if (JavaConsole.isEnabled() && debugPipe != -1) {
+            FileDescriptor debugPipeFD = new FileDescriptor();
+            fdAccess.set(debugPipeFD, debugPipe);
+            JavaConsole.getConsole().createPluginReader(new FileInputStream(debugPipeFD));
+        }
         PluginDebug.debug("Streams initialized");
         return streamHandler;