Issue 687 (#689)

mnyakushev · web-flow · commit 02ca6b545f18 · 2024-08-21T13:27:00.000+02:00
* issue-687

* issue-687
diff --git a/template/fr.opensagres.xdocreport.template.velocity/src/main/java/fr/opensagres/xdocreport/template/velocity/cache/XDocReportEntryResourceLoader.java b/template/fr.opensagres.xdocreport.template.velocity/src/main/java/fr/opensagres/xdocreport/template/velocity/cache/XDocReportEntryResourceLoader.java
@@ -28,6 +28,7 @@
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 
 import org.apache.velocity.exception.ResourceNotFoundException;
 import org.apache.velocity.runtime.RuntimeServices;
@@ -76,7 +77,7 @@ public Reader getResourceReader(String source, String encoding) throws ResourceN
             InputStream inputStream = cacheInfo.getInputStream();
             if ( inputStream != null )
             {
-                return new InputStreamReader(inputStream);
+                return encoding != null ? new InputStreamReader(inputStream, Charset.forName(encoding)) : new InputStreamReader(inputStream);
             }
         }
         throw new ResourceNotFoundException( "Cannot find input stream for the entry with source=" + source );

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`import java.io.InputStreamReader;`
`29`	`29`	`import java.io.Reader;`
`30`	`30`	`import java.io.UnsupportedEncodingException;`
	`31`	`+import java.nio.charset.Charset;`
`31`	`32`
`32`	`33`	`import org.apache.velocity.exception.ResourceNotFoundException;`
`33`	`34`	`import org.apache.velocity.runtime.RuntimeServices;`
`@@ -76,7 +77,7 @@ public Reader getResourceReader(String source, String encoding) throws ResourceN`
`76`	`77`	`InputStream inputStream = cacheInfo.getInputStream();`
`77`	`78`	`if ( inputStream != null )`
`78`	`79`	`{`
`79`		`- return new InputStreamReader(inputStream);`
	`80`	`+ return encoding != null ? new InputStreamReader(inputStream, Charset.forName(encoding)) : new InputStreamReader(inputStream);`
`80`	`81`	`}`
`81`	`82`	`}`
`82`	`83`	`throw new ResourceNotFoundException( "Cannot find input stream for the entry with source=" + source );`