Author: jawi
Date: Tue Jan 19 13:48:34 2016
New Revision: 1725519
URL: http://svn.apache.org/viewvc?rev=1725519&view=rev
Log:
FELIX-4375 - improve stream handling:
- improve the reading of gosh scripts from URLs using the proposed patch.
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java?rev=1725519&r1=1725518&r2=1725519&view=diff
==============================================================================
--- felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
(original)
+++ felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Shell.java
Tue Jan 19 13:48:34 2016
@@ -22,6 +22,7 @@ import java.io.File;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
@@ -232,23 +233,35 @@ public class Shell
private CharSequence readScript(URI script) throws Exception
{
+ CharBuffer buf = CharBuffer.allocate(4096);
+ StringBuilder sb = new StringBuilder();
+
URLConnection conn = script.toURL().openConnection();
- int length = conn.getContentLength();
- if (length == -1)
+ InputStreamReader in = null;
+ try
{
- System.err.println("eek! unknown Contentlength for: " + script);
- length = 10240;
+ in = new InputStreamReader(conn.getInputStream());
+ while (in.read(buf) > 0)
+ {
+ buf.flip();
+ sb.append(buf);
+ buf.clear();
+ }
+ }
+ finally
+ {
+ if (conn instanceof HttpURLConnection)
+ {
+ ((HttpURLConnection) conn).disconnect();
+ }
+ if (in != null)
+ {
+ in.close();
+ }
}
- InputStream in = conn.getInputStream();
- CharBuffer cbuf = CharBuffer.allocate(length);
- Reader reader = new InputStreamReader(in);
- reader.read(cbuf);
- in.close();
- cbuf.rewind();
-
- return cbuf;
+ return sb;
}
@SuppressWarnings("unchecked")
