Skip to content

Commit cb222e0

Browse files
committed
Cleaned up duplicate code
1 parent a483c80 commit cb222e0

File tree

1 file changed

+2
-15
lines changed
  • modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage

1 file changed

+2
-15
lines changed

modules/simple-java-mail/src/main/java/org/simplejavamail/converter/internal/mimemessage/MimeMessageParser.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.sun.mail.handlers.text_plain;
44
import org.jetbrains.annotations.NotNull;
55
import org.jetbrains.annotations.Nullable;
6+
import org.simplejavamail.internal.util.MiscUtil;
67
import org.simplejavamail.internal.util.Preconditions;
78

89
import javax.activation.ActivationDataFlavor;
@@ -25,9 +26,6 @@
2526
import javax.mail.internet.MimeUtility;
2627
import javax.mail.internet.ParseException;
2728
import javax.mail.util.ByteArrayDataSource;
28-
import java.io.BufferedInputStream;
29-
import java.io.BufferedOutputStream;
30-
import java.io.ByteArrayOutputStream;
3129
import java.io.IOException;
3230
import java.io.InputStream;
3331
import java.io.UnsupportedEncodingException;
@@ -387,19 +385,8 @@ private static String decodeText(@NotNull final String result) {
387385

388386
@NotNull
389387
private static byte[] readContent(@NotNull final InputStream is) {
390-
final BufferedInputStream isReader = new BufferedInputStream(is);
391-
final ByteArrayOutputStream os = new ByteArrayOutputStream();
392-
final BufferedOutputStream osWriter = new BufferedOutputStream(os);
393-
394-
int ch;
395388
try {
396-
while ((ch = isReader.read()) != -1) {
397-
osWriter.write(ch);
398-
}
399-
osWriter.flush();
400-
final byte[] result = os.toByteArray();
401-
osWriter.close();
402-
return result;
389+
return MiscUtil.readInputStreamToBytes(is);
403390
} catch (final IOException e) {
404391
throw new MimeMessageParseException(MimeMessageParseException.ERROR_READING_CONTENT, e);
405392
}

0 commit comments

Comments
 (0)