You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2020/01/11 18:30:27 UTC
[freemarker] 02/02: (Minor cleanup)
This is an automated email from the ASF dual-hosted git repository.
ddekany pushed a commit to branch 3
in repository https://gitbox.apache.org/repos/asf/freemarker.git
commit 4941acd8b06508d91a9ad079bbcf64486ab8a91b
Author: ddekany <dd...@apache.org>
AuthorDate: Sat Jan 11 19:30:09 2020 +0100
(Minor cleanup)
---
.../java/org/apache/freemarker/core/GetOptionalTemplateFunction.java | 4 +---
.../src/main/java/org/apache/freemarker/core/NativeSequence.java | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/GetOptionalTemplateFunction.java b/freemarker-core/src/main/java/org/apache/freemarker/core/GetOptionalTemplateFunction.java
index e8c32cf..b039e0e 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/GetOptionalTemplateFunction.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/GetOptionalTemplateFunction.java
@@ -94,9 +94,7 @@ class GetOptionalTemplateFunction implements TemplateFunctionModel {
throws TemplateException {
try {
return env.importLib(template, null);
- } catch (IOException e) {
- throw new TemplateException(e, "Failed to import loaded template; see cause exception");
- } catch (TemplateException e) {
+ } catch (IOException | TemplateException e) {
throw new TemplateException(e, "Failed to import loaded template; see cause exception");
}
}
diff --git a/freemarker-core/src/main/java/org/apache/freemarker/core/NativeSequence.java b/freemarker-core/src/main/java/org/apache/freemarker/core/NativeSequence.java
index 9f7af3a..a56febf 100644
--- a/freemarker-core/src/main/java/org/apache/freemarker/core/NativeSequence.java
+++ b/freemarker-core/src/main/java/org/apache/freemarker/core/NativeSequence.java
@@ -50,8 +50,7 @@ class NativeSequence implements TemplateSequenceModel, Serializable {
* Copies the collection
*/
public NativeSequence(Collection<TemplateModel> items) {
- this.items = new ArrayList<>(items.size());
- this.items.addAll(items);
+ this.items = new ArrayList<>(items);
}
void add(TemplateModel tm) {