Index: D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java
===================================================================
--- D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java	(revision 312500)
+++ D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/request/JetspeedRequestContext.java	(working copy)
@@ -15,6 +15,7 @@
  */
 package org.apache.jetspeed.request;
 
+import java.io.UnsupportedEncodingException;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -274,7 +275,7 @@
      * 
      * @param enc
      */
-    public void setCharacterEncoding( String enc )
+    public void setCharacterEncoding( String enc ) throws UnsupportedEncodingException
     {
         String preferedEnc = (String) request.getSession().getAttribute(PortalReservedParameters.PREFERED_CHARACTERENCODING_ATTRIBUTE);
 
@@ -284,6 +285,9 @@
         }
 
         this.encoding = enc;
+        
+        request.setCharacterEncoding( this.encoding );
+        
     }
 
     /**
Index: D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java
===================================================================
--- D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java	(revision 312500)
+++ D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/capabilities/impl/CapabilityValveImpl.java	(working copy)
@@ -16,6 +16,8 @@
 
 package org.apache.jetspeed.capabilities.impl;
 
+import java.io.UnsupportedEncodingException;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jetspeed.capabilities.Capabilities;
@@ -57,7 +59,6 @@
     public void invoke( RequestContext request, ValveContext context ) throws PipelineException
     {
 
-        String requestMediaType = request.getRequestParameter(ProfilingRule.STANDARD_MEDIATYPE);
         String agent = request.getRequest().getHeader("User-Agent");
 
         // Get capability map
@@ -104,7 +105,15 @@
         }
 
         // Put the encoding in the request
-        request.setCharacterEncoding(encoding);
+        try
+        {
+			request.setCharacterEncoding(encoding);
+		}
+        catch (UnsupportedEncodingException e)
+		{
+            log.error( "Could not set character encoding: " + encoding );
+            throw new PipelineException( "Could not set character encoding: " + encoding );
+		}
 
         // Put the CapabilityMap into the request
         request.setCapabilityMap(cm);
Index: D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
===================================================================
--- D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java	(revision 312500)
+++ D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java	(working copy)
@@ -148,21 +148,6 @@
                 String[] paramValues = (String[]) getRequest().getParameterValues(paramName);
                 String[] values = (String[]) portletParameters.get(paramName);
 
-                if (getCharacterEncoding() != null)
-                {
-                    for (int i = 0; i < paramValues.length; i++)
-                    {
-                        try
-                        {
-                            paramValues[i] = new String(paramValues[i].getBytes("ISO-8859-1"), getCharacterEncoding());
-                        }
-                        catch (UnsupportedEncodingException e)
-                        {
-                            ;
-                        }
-                    }
-                }
-
                 if (values != null)
                 {
                     String[] temp = new String[paramValues.length + values.length];
Index: D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java
===================================================================
--- D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java	(revision 312500)
+++ D:/java_files/eclipse/workspace/jetspeed-2/components/portal/src/java/org/apache/jetspeed/engine/JetspeedEngine.java	(working copy)
@@ -189,12 +189,8 @@
     public void service( RequestContext context ) throws JetspeedException
     {
 
-            String targetPipeline = context
-                    .getRequestParameter(PortalReservedParameters.PIPELINE);
-            if (null == targetPipeline)
-            {                
-                targetPipeline = (String)context.getAttribute(PortalReservedParameters.PIPELINE);                
-            }
+    		String targetPipeline = (String)context.getAttribute(PortalReservedParameters.PIPELINE);                
+
             // tlRequestContext.set(context);
             Pipeline pipeline = getPipeline();
             if (targetPipeline != null)
Index: D:/java_files/eclipse/workspace/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/request/RequestContext.java
===================================================================
--- D:/java_files/eclipse/workspace/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/request/RequestContext.java	(revision 312500)
+++ D:/java_files/eclipse/workspace/jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/request/RequestContext.java	(working copy)
@@ -15,6 +15,7 @@
  */
 package org.apache.jetspeed.request;
 
+import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -196,7 +197,7 @@
      *
      * @param enc
      */
-    public void setCharacterEncoding(String enc);
+    public void setCharacterEncoding(String enc) throws UnsupportedEncodingException;
 
     /**
      *