This is an automated email from the ASF dual-hosted git repository.
rmaucher pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
The following commit(s) were added to refs/heads/main by this push:
new d08c7d6 Avoid useless operation when not converting
d08c7d6 is described below
commit d08c7d635f998626fc8c015b2098224fd3e4c5c9
Author: remm <remm@meteor>
AuthorDate: Fri Sep 4 11:36:47 2026 +0200
Avoid useless operation when not converting
---
src/main/java/org/apache/tomcat/jakartaee/TextConverter.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
index 7421165..d78eda5 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
@@ -26,6 +26,8 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.commons.io.IOUtils;
+
/**
* Converter for text resources.
*/
@@ -76,7 +78,9 @@ public class TextConverter implements Converter {
*/
@Override
public boolean convert(String path, InputStream src, OutputStream dest,
EESpecProfile profile) throws IOException {
- String srcString = Util.toString(src, StandardCharsets.ISO_8859_1);
+ byte[] srcBytes = IOUtils.toByteArray(src);
+ String srcString = new String(srcBytes, StandardCharsets.ISO_8859_1);
+
String destString = profile.convert(srcString);
// Object comparison is deliberate here
boolean converted = srcString != destString;
@@ -85,15 +89,15 @@ public class TextConverter implements Converter {
if (logger.isLoggable(Level.FINE)) {
logger.log(Level.FINE, sm.getString("textConverter.converted",
path));
}
+ ByteArrayInputStream bais = new
ByteArrayInputStream(destString.getBytes(StandardCharsets.ISO_8859_1));
+ Util.copy(bais, dest);
} else {
if (logger.isLoggable(Level.FINEST)) {
logger.log(Level.FINEST,
sm.getString("textConverter.noConversion", path));
}
+ Util.copy(new ByteArrayInputStream(srcBytes), dest);
}
- ByteArrayInputStream bais = new
ByteArrayInputStream(destString.getBytes(StandardCharsets.ISO_8859_1));
- Util.copy(bais, dest);
-
return converted;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
