You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/09/29 09:02:33 UTC
svn commit: r1762749 -
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Author: rgodfrey
Date: Thu Sep 29 09:02:33 2016
New Revision: 1762749
URL: http://svn.apache.org/viewvc?rev=1762749&view=rev
Log:
QPID-7379 : address review comment on filename for export
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1762749&r1=1762748&r2=1762749&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Thu Sep 29 09:02:33 2016
@@ -29,8 +29,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
+import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.security.AccessControlContext;
import java.security.Principal;
@@ -917,10 +919,19 @@ public abstract class AbstractVirtualHos
return "application/octet-stream";
}
+ @SuppressWarnings("unused")
@RestContentHeader("Content-Disposition")
public String getContentDisposition()
{
- return "attachment; filename=\"" + getName() + "_messages.bin\"";
+ try
+ {
+ return String.format("attachment; filename=\"%s_messages.bin\"",
+ URLEncoder.encode(getName(), StandardCharsets.UTF_8.name()));
+ }
+ catch (UnsupportedEncodingException e)
+ {
+ throw new RuntimeException("JVM does not support UTF8", e);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org