Author: michiel
Date: 2009-05-18 15:14:29 +0200 (Mon, 18 May 2009)
New Revision: 35262
Modified:
mmbase/trunk/applications/resources/src/org/mmbase/util/images/ImageMagickImageConverter.java
Log:
executing with env=String[0] is not the same thing as with with env=null. In
1.8 it did the last thing, but some the first thing if a cwd was provided. Now,
it always takes the current environment as a base value.
Modified:
mmbase/trunk/applications/resources/src/org/mmbase/util/images/ImageMagickImageConverter.java
===================================================================
---
mmbase/trunk/applications/resources/src/org/mmbase/util/images/ImageMagickImageConverter.java
2009-05-18 13:13:17 UTC (rev 35261)
+++
mmbase/trunk/applications/resources/src/org/mmbase/util/images/ImageMagickImageConverter.java
2009-05-18 13:14:29 UTC (rev 35262)
@@ -619,17 +619,29 @@
log.info("" + this + " executing " + command);
- String[] env;
+
+
+ Map<String, String> envMap;
if (cwd != null) {
// using MAGICK_HOME for mmbase config/fonts if 'font' option used
(can put type.mgk)
- env = new String[] { "MAGICK_HOME=" + cwd.toString() };
+ envMap = new HashMap<String, String>();
+ envMap.putAll(System.getenv());
+
+ envMap.put("MAGICK_HOME", cwd.toString());
if (log.isDebugEnabled()) {
- log.debug("MAGICK_HOME " + env[0]);
+ log.debug("MAGICK_HOME " + cwd.toString());
}
} else {
- env = new String[] {};
+ envMap = System.getenv();
}
+ String[] env = new String[envMap.size()];
+ int i = 0;
+ for (Map.Entry<String, String> entry : envMap.entrySet()) {
+ env[i++] = entry.getKey() + "=" + entry.getValue();
+ }
+
+
ByteArrayOutputStream errorStream = new ByteArrayOutputStream();
try {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
