TARGET_JVM: use J2EEUtils.InputStreamWrapper for reading java's InputStream

svn path=/trunk/mcs/; revision=92588

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationHost.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationHost.cs
index 2cf97f5aa93174cfa7826340c4cf674c0d777365..206294a2d786b0f21affb570843a5c7d524a18c1 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationHost.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/WebConfigurationHost.cs
@@ -383,7 +383,7 @@ namespace System.Web.Configuration
                                        java.lang.ClassLoader cl = (java.lang.ClassLoader) AppDomain.CurrentDomain.GetData ("GH_ContextClassLoader");
                                        if (cl != null) {
                                                java.io.InputStream inputStream = cl.getResourceAsStream (streamName);
-                                               return (Stream) vmw.common.IOUtils.getStream (inputStream);
+                                               return new System.Web.J2EE.J2EEUtils.InputStreamWrapper (inputStream);
                                        }
                                }
 #endif

diff --git a/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs b/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
index c8e6d78089bc5a102fc99993a98764a8fb5e33c4..d0c41e25abc9513755a6ca407a93ed669ca2da9d 100644 (file)
--- a/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
+++ b/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
@@ -405,7 +405,6 @@ namespace System.Web
 #if TARGET_J2EE
                private static TextReader GetJavaTextReader(string filename)
                {
-                       Stream s;
                        try
                        {
                                java.lang.ClassLoader cl = (java.lang.ClassLoader)
@@ -419,13 +418,15 @@ namespace System.Web
                                if (inputStream == null)
                                        inputStream = cl.getResourceAsStream(filename);
 
-                               s = (Stream)vmw.common.IOUtils.getStream(inputStream);
+                               if (inputStream == null)
+                                       return null;
+
+                               return new StreamReader (new System.Web.J2EE.J2EEUtils.InputStreamWrapper (inputStream));
                        }
                        catch (Exception e)
                        {
                                return null;
                        }
-                       return new StreamReader (s);
                }
 #endif