[Laszlo-checkins] r10620 - in openlaszlo/branches/4.2alpha: . WEB-INF/lps/server/src/org/openlaszlo/sc

[ptw@openlaszlo.org]

Author: ptw
Date: 2008-08-06 16:58:49 -0700 (Wed, 06 Aug 2008)
New Revision: 10620

Modified:
   openlaszlo/branches/4.2alpha/
   openlaszlo/branches/4.2alpha/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java
Log:
Change 20080806-ptw-P by ptw at dueling-banjos.local on 2008-08-06 19:58:09 EDT
    in /Users/ptw/OpenLaszlo/4.2alpha
    for http://svn.openlaszlo.org/openlaszlo/branches/4.2alpha

Summary: Integrate 10616 from trunk




Property changes on: openlaszlo/branches/4.2alpha
___________________________________________________________________
Name: svnmerge-integrated
   - /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-10548
   + /openlaszlo/branches/4.1:1-10153 /openlaszlo/branches/devildog:1-8432 /openlaszlo/branches/pagan-deities:1-7955,8825 /openlaszlo/branches/paperpie:1-6504,6506-6574,6576-7135,7137-7235 /openlaszlo/branches/wafflecone:1-5746,5818-6068,6070-6205,6207-6213,6216-6265,6267-6368,6370-6431,6433-6450,6497,6509,6661,7097,7872 /openlaszlo/trunk:1-10548,10616

Modified: openlaszlo/branches/4.2alpha/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java
===================================================================
--- openlaszlo/branches/4.2alpha/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java	2008-08-06 23:57:26 UTC (rev 10619)
+++ openlaszlo/branches/4.2alpha/WEB-INF/lps/server/src/org/openlaszlo/sc/SWF9External.java	2008-08-06 23:58:49 UTC (rev 10620)
@@ -463,6 +463,7 @@
     newenv.add("FLEX_HOME="+FLEX_HOME());
     copyEnvVar(newenv, "HOME");
     copyEnvVar(newenv, "PATH");
+    copyEnvVar(newenv, "JAVA_HOME");
     Process proc = Runtime.getRuntime().exec(cmdstr, (String[])newenv.toArray(new String[0]), null);
     try {
       OutputStream os = proc.getOutputStream();