Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Improved: replaces java.rmi.server.UID by java.util.UUID
Not a big deal but better use java.util.UUID there.
  • Loading branch information
JacquesLeRoux committed Mar 23, 2021
1 parent 00b92f4 commit 75d3367
Showing 1 changed file with 12 additions and 11 deletions.
Expand Up @@ -18,23 +18,24 @@
*******************************************************************************/
package org.apache.ofbiz.widget.renderer.macro;

import freemarker.core.Environment;
import freemarker.template.Template;
import freemarker.template.TemplateException;
import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilMisc;
import org.apache.ofbiz.base.util.template.FreeMarkerWorker;
import org.apache.ofbiz.widget.renderer.VisualTheme;
import org.apache.ofbiz.widget.renderer.macro.renderable.RenderableFtl;

import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.rmi.server.UID;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
import java.util.WeakHashMap;

import org.apache.ofbiz.base.util.Debug;
import org.apache.ofbiz.base.util.UtilMisc;
import org.apache.ofbiz.base.util.template.FreeMarkerWorker;
import org.apache.ofbiz.widget.renderer.VisualTheme;
import org.apache.ofbiz.widget.renderer.macro.renderable.RenderableFtl;

import freemarker.core.Environment;
import freemarker.template.Template;
import freemarker.template.TemplateException;

/**
* Processes FTL templates and writes result to Appendables.
*/
Expand Down Expand Up @@ -73,7 +74,7 @@ public void processFtlString(Appendable writer, Locale locale, String ftlString)
environment.setVariable("modelTheme",
FreeMarkerWorker.autoWrap(visualTheme.getModelTheme(), environment));
Reader templateReader = new StringReader(ftlString);
Template template = new Template(new UID().toString(), templateReader,
Template template = new Template(UUID.randomUUID().toString(), templateReader,
FreeMarkerWorker.getDefaultOfbizConfig());
templateReader.close();
environment.include(template);
Expand Down

0 comments on commit 75d3367

Please sign in to comment.