diff options
| author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 16:35:07 +0000 |
|---|---|---|
| committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-10-26 16:35:07 +0000 |
| commit | 8a6cedf72ec567bd6b25c02b6ae656b9b597adc1 (patch) | |
| tree | ba26414fdbe565c3d5f625bfb06ecfebea8aeb17 /sca-java-1.x/trunk | |
| parent | 5af5db1b322dc75b7db907a2a85a1301b0beee47 (diff) | |
Merge r1025503 TUSCANY-3737: Fix conversion from RSS feed to Atom feed to use UTF-8 charset
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027635 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk')
| -rw-r--r-- | sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java | 2 | ||||
| -rw-r--r-- | sca-java-1.x/trunk/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java index d4adf03851..855054003d 100644 --- a/sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java +++ b/sca-java-1.x/trunk/samples/feed-aggregator-webapp/src/main/java/feed/AggregatorImpl.java @@ -166,7 +166,7 @@ public class AggregatorImpl implements org.apache.tuscany.sca.binding.atom.colle syndFeed.setFeedType("atom_1.0"); SyndFeedOutput syndOutput = new SyndFeedOutput(); try { - syndOutput.output(syndFeed, new OutputStreamWriter(bos)); + syndOutput.output(syndFeed, new OutputStreamWriter(bos, "UTF-8")); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/sca-java-1.x/trunk/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java b/sca-java-1.x/trunk/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java index 7b2edb2e6a..506701168e 100644 --- a/sca-java-1.x/trunk/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java +++ b/sca-java-1.x/trunk/samples/feed-aggregator/src/main/java/feed/AggregatorImpl.java @@ -187,7 +187,7 @@ public class AggregatorImpl implements org.apache.tuscany.sca.binding.atom.colle syndFeed.setFeedType("atom_1.0"); SyndFeedOutput syndOutput = new SyndFeedOutput(); try { - syndOutput.output(syndFeed, new OutputStreamWriter(bos)); + syndOutput.output(syndFeed, new OutputStreamWriter(bos, "UTF-8")); } catch (Exception e) { throw new RuntimeException(e); } |