You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/05/01 00:00:29 UTC
svn commit: r1741821 - in
/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments:
MIMEMessage.java Util.java
Author: veithen
Date: Sat Apr 30 22:00:29 2016
New Revision: 1741821
URL: http://svn.apache.org/viewvc?rev=1741821&view=rev
Log:
Move the normalizeContentID utility method to MIMEMessage since it is only used there.
Modified:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Util.java
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java?rev=1741821&r1=1741820&r2=1741821&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java Sat Apr 30 22:00:29 2016
@@ -83,7 +83,7 @@ class MIMEMessage implements Iterable<Pa
}
String start = contentType.getParameter("start");
- rootPartContentID = start == null ? null : Util.normalizeContentID(start);
+ rootPartContentID = start == null ? null : normalizeContentID(start);
MimeConfig config = new MimeConfig();
config.setStrictParsing(true);
@@ -103,6 +103,20 @@ class MIMEMessage implements Iterable<Pa
}
}
+ private static String normalizeContentID(String contentID) {
+ contentID = contentID.trim();
+ if (contentID.length() >= 2 && contentID.charAt(0) == '<'
+ && contentID.charAt(contentID.length()-1) == '>') {
+ contentID = contentID.substring(1, contentID.length()-1);
+ }
+ // There is some evidence that some broken MIME implementations add
+ // a "cid:" prefix to the Content-ID; remove it if necessary.
+ if (contentID.length() > 4 && contentID.startsWith("cid:")) {
+ contentID = contentID.substring(4);
+ }
+ return contentID;
+ }
+
ContentType getContentType() {
return contentType;
}
@@ -158,7 +172,7 @@ class MIMEMessage implements Iterable<Pa
}
headers.add(new Header(name, value));
if (partContentID == null && name.equalsIgnoreCase("Content-ID")) {
- partContentID = Util.normalizeContentID(value);
+ partContentID = normalizeContentID(value);
}
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Util.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Util.java?rev=1741821&r1=1741820&r2=1741821&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Util.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Util.java Sat Apr 30 22:00:29 2016
@@ -26,20 +26,6 @@ import org.apache.axiom.mime.Part;
final class Util {
private Util() {}
- static String normalizeContentID(String contentID) {
- contentID = contentID.trim();
- if (contentID.length() >= 2 && contentID.charAt(0) == '<'
- && contentID.charAt(contentID.length()-1) == '>') {
- contentID = contentID.substring(1, contentID.length()-1);
- }
- // There is some evidence that some broken MIME implementations add
- // a "cid:" prefix to the Content-ID; remove it if necessary.
- if (contentID.length() > 4 && contentID.startsWith("cid:")) {
- contentID = contentID.substring(4);
- }
- return contentID;
- }
-
/**
* Get the content type that should be reported by {@link DataSource} instances created for a
* given part.