Index: src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet2.java
===================================================================
RCS file: /home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet2.java,v
retrieving revision 1.5
diff -u -r1.5 WebPagePortlet2.java
--- src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet2.java	23 Feb 2004 04:03:34 -0000	1.5
+++ src/java/org/apache/jetspeed/portal/portlets/WebPagePortlet2.java	1 Jun 2004 14:21:24 -0000
@@ -40,6 +40,7 @@
 import java.io.Reader;
 import java.net.URL;
 import java.net.URLConnection;
+import java.util.StringTokenizer;
 
 /**
  * A class that loads a web page and filters it to have certain features
@@ -121,14 +122,29 @@
         }
         
         long           pageExpiration = pageConn.getExpiration();
-        String         encoding = pageConn.getContentEncoding();
+        String         encoding = "iso-8859-1";
+        String         contentType = pageConn.getContentType();
         String         tempString = null;
         String         noCache = "no-cache";
         
-        if(encoding == null)
+        if (contentType != null)
         {
-            // Standard HTTP encoding
-            encoding = "iso-8859-1";
+            StringTokenizer st = new StringTokenizer(contentType, "; =");
+            while (st.hasMoreTokens())
+            {
+                if (st.nextToken().equalsIgnoreCase("charset"))
+                {
+                    try
+                    {
+                        encoding = st.nextToken();
+                        break;
+                    }
+                    catch (Exception e)
+                    {
+                        break;
+                    }
+                }
+            }
         }
 
         /*