From 6f4558886e60cf396bced6af90cc34e38312b436 Mon Sep 17 00:00:00 2001
From: Shinsuke Sugaya <shinsuke@apache.org>
Date: Thu, 21 Sep 2017 06:44:40 +0900
Subject: [PATCH] fix #1284 keep +
---
.../fess/crawler/transformer/FessTransformer.java | 6 ------
.../fess/crawler/transformer/FessFileTransformerTest.java | 8 ++++++++
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java b/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java
index d372c43af..c6094504f 100644
--- a/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java
+++ b/src/main/java/org/codelibs/fess/crawler/transformer/FessTransformer.java
@@ -204,12 +204,6 @@ public interface FessTransformer {
u = StringUtil.EMPTY;
}
}
-
- try {
- u = URLDecoder.decode(u, encoding);
- } catch (final Exception e) {
- // ignore
- }
return u;
}
diff --git a/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java b/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java
index bbe97629a..0bfa077c9 100644
--- a/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java
+++ b/src/test/java/org/codelibs/fess/crawler/transformer/FessFileTransformerTest.java
@@ -76,6 +76,14 @@ public class FessFileTransformerTest extends UnitFessTestCase {
url = "http://example.com/" + encodeUrl("#") + "/@@folder/test.txt";
exp = "test.txt";
assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+ url = "http://example.com/test%20+%2B.txt";
+ exp = "test +.txt";
+ assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
+
+ url = "file://example.com/test%20+%2B.txt";
+ exp = "test ++.txt";
+ assertEquals(exp, transformer.getFileName(url, Constants.UTF_8));
}
public void test_decodeUrl_null() throws Exception {
--
GitLab