[jboss-cvs] JBossAS SVN: r91298 - projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2009-07-15 11:07:50 -0400 (Wed, 15 Jul 2009)
New Revision: 91298

Modified:
   projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherServlet.java
Log:
Handle previous flag.

Modified: projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherServlet.java
===================================================================
--- projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherServlet.java	2009-07-15 14:58:09 UTC (rev 91297)
+++ projects/mc-tools/grapher/trunk/src/main/java/org/jboss/mctools/grapher/GrapherServlet.java	2009-07-15 15:07:50 UTC (rev 91298)
@@ -60,6 +60,7 @@
 public class GrapherServlet extends HttpServlet
 {
    private Logger log = Logger.getLogger(getClass());
+   private String previous;
 
    private KernelController controller;
    private GraphCreatorMapper mapper;
@@ -100,13 +101,20 @@
          renderer = createInstance(defaultRenderer, renderers.get(GrapherConstants.FORMAT), Renderer.class);
 
       // apply headless graphics
-      System.setProperty("java.awt.headless", "true");
+      previous = System.setProperty("java.awt.headless", "true");
+      if ("false".equals(previous))
+      {
+         log.warn("Headless AWT was explicitly disabled, potential graph rendering conflict.");
+      }
    }
 
    @Override
    public void destroy()
    {
-      System.clearProperty("java.awt.headless");
+      if (previous == null)
+         System.clearProperty("java.awt.headless");
+      else
+         System.setProperty("java.awt.headless", previous);
    }
 
    /**