ate 2004/10/19 13:20:36
Modified: portal/src/java/org/apache/jetspeed/container/state/impl
JetspeedNavigationalStateCodec.java
Log:
Allow null value for characterEncoding (meaning fallback to default encoding).
This fixes the broken TestNavigationalState testcase.
Revision Changes Path
1.3 +17 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java
Index: JetspeedNavigationalStateCodec.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/container/state/impl/JetspeedNavigationalStateCodec.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedNavigationalStateCodec.java 17 Oct 2004 22:54:01 -0000 1.2
+++ JetspeedNavigationalStateCodec.java 19 Oct 2004 20:20:36 -0000 1.3
@@ -519,7 +519,14 @@
{
value = StringUtils.replace(value,"-","/");
value = StringUtils.replace(value,"_","=");
- return new String(Base64.decodeBase64(value.getBytes(characterEncoding)),
characterEncoding);
+ if ( characterEncoding != null )
+ {
+ return new
String(Base64.decodeBase64(value.getBytes(characterEncoding)), characterEncoding);
+ }
+ else
+ {
+ return new String(Base64.decodeBase64(value.getBytes()));
+ }
}
/**
@@ -535,7 +542,14 @@
protected String encodeParameters(String value, String characterEncoding)
throws UnsupportedEncodingException
{
- value = new String(Base64.encodeBase64(value.getBytes(characterEncoding)));
+ if ( characterEncoding != null )
+ {
+ value = new
String(Base64.encodeBase64(value.getBytes(characterEncoding)));
+ }
+ else
+ {
+ value = new String(Base64.encodeBase64(value.getBytes()));
+ }
value = StringUtils.replace(value,"/","-");
value = StringUtils.replace(value,"=","_");
return value;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
