Changeset f97402b

Timestamp:

Feb 11, 2011 7:13:47 PM (9 years ago)

Author:

mathiasdm <mathiasdm@…>

Branches:

master

Children:

1d1472c

Parents:

dd2c506 (diff), 4471567 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge of 'a6e9aa4eede6931f8bd627a7b6feb3902c8b5113'

and 'd8b436ffeb6b54ba576de5b3caea5f713efdedee'

Files:

• apps/desktopgui/src/net/i2p/desktopgui/Main.java (modified) (1 diff)
• apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java (modified) (2 diffs)
• build.xml (modified) (1 diff)
• history.txt (modified) (1 diff)

apps/desktopgui/src/net/i2p/desktopgui/Main.java

@@ -56 +56 @@
      */
     public static void beginStartup(String[] args) {
-        boolean wasHeadless = Boolean.valueOf(System.getProperty("java.awt.headless")).booleanValue();
-        if(wasHeadless) {
-            System.setProperty("java.awt.headless", "false");
+        try {
+            String headless = RouterManager.getRouterContext().getProperty("router.isHeadless");
+            boolean isHeadless = Boolean.parseBoolean(headless);
+            if(isHeadless) {
+                return;
+            }
         }
-        boolean headless_check = true;
-        try {
-            // X permissions error is a java.lang.InternalError (a Throwable)
-            GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-            headless_check = ge.isHeadlessInstance();
-        } catch (Throwable t) {}
-        if (wasHeadless)
-            System.setProperty("java.awt.headless", "true");
-        if (headless_check) {
+        catch(Exception e) {
             return;
         }

apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.io.FilenameFilter;
@@ -55 +56 @@
     private static final String USAGE = "Bad RouterConsoleRunner arguments, check clientApp.0.args in your clients.config file! " +
                                         "Usage: [[port host[,host]] [-s sslPort [host[,host]]] [webAppsDir]]";
+    private static final String PROP_HEADLESS = "router.isHeadless";
     
     static {
         System.setProperty("org.mortbay.http.Version.paranoid", "true");
-        System.setProperty("java.awt.headless", "true");
+        
+        //Check if we are in a headless environment, set properties accordingly
+        List<RouterContext> contexts = RouterContext.listContexts();
+        if(contexts != null && contexts.size() > 0) {
+                RouterContext context = contexts.get(0);
+                String headless = context.getProperty(PROP_HEADLESS);
+                if(headless == null) {
+                        /*
+                         * Let's check if we are in a headless environment.
+                         * We do this by setting headless to false
+                         * and trying to get the graphics environment.
+                         * If this fails, we should be headless.
+                         */
+                        System.setProperty("java.awt.headless", "false");
+                        try {
+                        GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
+                        ge.isHeadlessInstance();
+                        context.setProperty(PROP_HEADLESS, "false");
+                        }
+                        catch(InternalError e) {
+                                context.setProperty(PROP_HEADLESS, "true");
+                        }
+                        context.router().setConfigSetting(PROP_HEADLESS, context.getProperty(PROP_HEADLESS));
+                context.router().saveConfig();
+                context.router().shutdown(0);
+                }
+                boolean isHeadless = true;
+                try {
+                        isHeadless = Boolean.parseBoolean(headless);
+                }
+                catch(Exception e) {
+                        //Incorrect setting, let's choose headless for safety
+                        isHeadless = true;
+                }
+                if(isHeadless) {
+                        System.setProperty("java.awt.headless", "true");
+                }
+                else {
+                        System.setProperty("java.awt.headless", "false");
+                }
+        }
     }
     

build.xml

@@ -98 +98 @@
 
     <target name="buildDesktopGui" depends="buildCore, buildrouter" >
+        <ant dir="apps/desktopgui" target="clean" />
         <ant dir="apps/desktopgui" target="jar" />
     </target>

history.txt

@@ +1 @@
+2011-02-11 Mathiasdm
+    * routerconsole: fixed graphs using jrobin; and headless issue
+          in general: no more switches between headless and non-headless.
+
 2011-02-11 sponge
     * I2PTunnel: fix NPE in I2PTunnelConnectClient