338d337
< 
353,355c352
<                 // ORCL check here for unsupported encoding
<                 if (charEncoding != null && !charEncoding.equals("")) {
<                   try {
---
> 	        if (charEncoding != null && !charEncoding.equals(""))
357,361d353
<                   } catch (java.io.UnsupportedEncodingException ex) {
<                     throw new JspException ("Unsupported encoding : " + 
<                      charEncoding);                     
<                   }
<                 }
363,379c355,359
<                   // ORCL don't think ContentEncoding is what is wanted here
<                   String responseAdvisoryEncoding = uc.getContentEncoding();
<                   // instead, get charset from content type if there
<                   String responseAdvisoryType = uc.getContentType();
<                   int len = responseAdvisoryType.indexOf("charset=") + 8;
<                   String charSet = ((len == -1 || len >
<                        responseAdvisoryType.length()) ?  null :
<                        responseAdvisoryType.substring(len,
<                        responseAdvisoryType.length())); 
<                   if (charSet != null && !charSet.equals("")) 
<                       try { 
<                         r = new InputStreamReader(i, charSet);
<                        } catch (java.io.UnsupportedEncodingException ex) {
<                          r = new InputStreamReader(i, DEFAULT_ENCODING);
<                        }
<                     else
<                         r = new InputStreamReader(i, DEFAULT_ENCODING);
---
> 		    String responseAdvisoryEncoding = uc.getContentEncoding();
> 		    if (responseAdvisoryEncoding != null)
> 		        r = new InputStreamReader(i, responseAdvisoryEncoding);
> 		    else
> 		        r = new InputStreamReader(i, DEFAULT_ENCODING);
388a369
>