You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2014/03/21 16:48:16 UTC
[3/3] git commit: safeguard against unsupported encodings
safeguard against unsupported encodings
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1f6b6592
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1f6b6592
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1f6b6592
Branch: refs/heads/master
Commit: 1f6b6592d9e65a645c0d52488764c2df28665a11
Parents: fea2b8e
Author: svenmeier <sv...@meiers.net>
Authored: Fri Mar 21 16:43:21 2014 +0100
Committer: svenmeier <sv...@meiers.net>
Committed: Fri Mar 21 16:43:21 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/jmx/MarkupSettingsMBean.java | 6 +++++-
.../org/apache/wicket/jmx/RequestCycleSettingsMBean.java | 7 ++++++-
.../java/org/apache/wicket/jmx/wrapper/MarkupSettings.java | 8 +++++++-
.../org/apache/wicket/jmx/wrapper/RequestCycleSettings.java | 9 +++++++++
4 files changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1f6b6592/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettingsMBean.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettingsMBean.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettingsMBean.java
index df0d25d..ef644c1 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettingsMBean.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/MarkupSettingsMBean.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.jmx;
+import java.io.UnsupportedEncodingException;
+
import org.apache.wicket.jmx.wrapper.MarkupSettings;
/**
@@ -94,8 +96,10 @@ public interface MarkupSettingsMBean
* will be used.
*
* @param encoding
+ * @throws UnsupportedEncodingException
+ * if encoding is not supported
*/
- void setDefaultMarkupEncoding(final String encoding);
+ void setDefaultMarkupEncoding(final String encoding) throws UnsupportedEncodingException;
/**
* Enables stripping of markup comments denoted in markup by HTML comment tagging.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1f6b6592/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestCycleSettingsMBean.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestCycleSettingsMBean.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestCycleSettingsMBean.java
index 855ee3e..b4393bf 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestCycleSettingsMBean.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/RequestCycleSettingsMBean.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.jmx;
+import java.io.UnsupportedEncodingException;
+
import org.apache.wicket.markup.html.pages.BrowserInfoPage;
/**
@@ -83,8 +85,11 @@ public interface RequestCycleSettingsMBean
*
* @param responseRequestEncoding
* The request and response encoding to be used.
+ * @throws UnsupportedEncodingException
+ * is encoding is not supported
*/
- void setResponseRequestEncoding(final String responseRequestEncoding);
+ void setResponseRequestEncoding(final String responseRequestEncoding)
+ throws UnsupportedEncodingException;
/**
* Sets the time that a request will by default be waiting for the previous request to be
http://git-wip-us.apache.org/repos/asf/wicket/blob/1f6b6592/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/MarkupSettings.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/MarkupSettings.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/MarkupSettings.java
index 387b2ba..5d1bd23 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/MarkupSettings.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/MarkupSettings.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.jmx.wrapper;
+import java.io.UnsupportedEncodingException;
+
import org.apache.wicket.Application;
import org.apache.wicket.jmx.MarkupSettingsMBean;
@@ -103,11 +105,15 @@ public class MarkupSettings implements MarkupSettingsMBean
}
/**
+ * @throws UnsupportedEncodingException
* @see org.apache.wicket.jmx.MarkupSettingsMBean#setDefaultMarkupEncoding(java.lang.String)
*/
@Override
- public void setDefaultMarkupEncoding(final String encoding)
+ public void setDefaultMarkupEncoding(final String encoding) throws UnsupportedEncodingException
{
+ // test encoding is available
+ "".getBytes(encoding);
+
application.getMarkupSettings().setDefaultMarkupEncoding(encoding);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1f6b6592/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/RequestCycleSettings.java
----------------------------------------------------------------------
diff --git a/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/RequestCycleSettings.java b/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/RequestCycleSettings.java
index 8fa04f2..b5707dc 100644
--- a/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/RequestCycleSettings.java
+++ b/wicket-jmx/src/main/java/org/apache/wicket/jmx/wrapper/RequestCycleSettings.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.jmx.wrapper;
+import java.io.UnsupportedEncodingException;
+
import org.apache.wicket.Application;
import org.apache.wicket.jmx.RequestCycleSettingsMBean;
import org.apache.wicket.util.time.Duration;
@@ -96,11 +98,18 @@ public class RequestCycleSettings implements RequestCycleSettingsMBean
}
/**
+ * @throws UnsupportedEncodingException
+ * if encoding is not supported
+ *
* @see org.apache.wicket.jmx.RequestCycleSettingsMBean#setResponseRequestEncoding(java.lang.String)
*/
@Override
public void setResponseRequestEncoding(final String responseRequestEncoding)
+ throws UnsupportedEncodingException
{
+ // test encoding is available
+ "".getBytes(responseRequestEncoding);
+
application.getRequestCycleSettings().setResponseRequestEncoding(responseRequestEncoding);
}