You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by as...@apache.org on 2015/07/22 21:37:46 UTC
[1/2] cxf git commit: [CXF-6484] Regression in Content-id format -
applying patch from 2.7.x pull request - Thanks Chris Dolphy
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 4eb8d15a2 -> 5d021211f
[CXF-6484] Regression in Content-id format - applying patch from 2.7.x pull request - Thanks Chris Dolphy
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c10ec21f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c10ec21f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c10ec21f
Branch: refs/heads/3.0.x-fixes
Commit: c10ec21f253508989a90ba6304dbba69dfc22b1a
Parents: 4eb8d15
Author: Alessio Soldano <as...@redhat.com>
Authored: Wed Jul 22 21:24:32 2015 +0200
Committer: Alessio Soldano <as...@redhat.com>
Committed: Wed Jul 22 21:29:23 2015 +0200
----------------------------------------------------------------------
.../main/java/org/apache/cxf/attachment/AttachmentUtil.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c10ec21f/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
index ba82579..a054ca2 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentUtil.java
@@ -24,6 +24,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URL;
import java.net.URLDecoder;
import java.net.URLEncoder;
@@ -196,7 +197,12 @@ public final class AttachmentUtil {
String name = ATT_UUID + "-" + String.valueOf(++counter);
if (ns != null && (ns.length() > 0)) {
- cid = ns;
+ try {
+ URI uri = new URI(ns);
+ cid = uri.getHost();
+ } catch (Exception e) {
+ cid = ns;
+ }
}
return URLEncoder.encode(name, "UTF-8") + "@" + URLEncoder.encode(cid, "UTF-8");
}
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Posted by as...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5d021211
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5d021211
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5d021211
Branch: refs/heads/3.0.x-fixes
Commit: 5d021211f26472ccd374a166d4b45583578851f9
Parents: c10ec21
Author: Alessio Soldano <as...@redhat.com>
Authored: Wed Jul 22 21:30:35 2015 +0200
Committer: Alessio Soldano <as...@redhat.com>
Committed: Wed Jul 22 21:30:35 2015 +0200
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/5d021211/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 49ddda8..3016e0a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -511,6 +511,7 @@ M aaad96fdf931cdc619a60fbffe3c9c894ae8ea43
M ad75192db72294e6d117e020aea890a50c166f79
M af2f7d3a52076f60d0f98a2635e2adef256a9efe
M b283eeb95544b6088331b37567c851564655bff4
+M b5320827561467de7e04afdba15a6063d26493a3
M b9e4fcf44fc690c328afbfa166acca26ecb4c16a
M bc5e828cd8a25c4c4107c76e1582f807e75c9a77
M bd1d31f195caab56fbe565fbfb63d9170a0c9406