Latest bnd code
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1350613 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/aQute/libg/gzip/GZipUtils.java b/bundleplugin/src/main/java/aQute/libg/gzip/GZipUtils.java
index 6606d0e..81c9785 100644
--- a/bundleplugin/src/main/java/aQute/libg/gzip/GZipUtils.java
+++ b/bundleplugin/src/main/java/aQute/libg/gzip/GZipUtils.java
@@ -1,13 +1,10 @@
package aQute.libg.gzip;
-import java.io.BufferedInputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.GZIPInputStream;
+import java.io.*;
+import java.util.zip.*;
public class GZipUtils {
-
+
/**
* Determines whether the specified stream contains gzipped data, by
* checking for the GZIP magic number, and returns a stream capable of
@@ -21,11 +18,11 @@
buffered = stream;
else
buffered = new BufferedInputStream(stream);
-
+
buffered.mark(2);
int magic = readUShort(buffered);
buffered.reset();
-
+
InputStream result;
if (magic == GZIPInputStream.GZIP_MAGIC)
result = new GZIPInputStream(buffered);
@@ -34,27 +31,27 @@
return result;
}
- /*
- * Reads unsigned short in Intel byte order.
- */
+ /*
+ * Reads unsigned short in Intel byte order.
+ */
private static int readUShort(InputStream in) throws IOException {
int b = readUByte(in);
return (readUByte(in) << 8) | b;
}
-
- /*
- * Reads unsigned byte.
- */
- private static int readUByte(InputStream in) throws IOException {
- int b = in.read();
- if (b == -1) {
- throw new EOFException();
+
+ /*
+ * Reads unsigned byte.
+ */
+ private static int readUByte(InputStream in) throws IOException {
+ int b = in.read();
+ if (b == -1) {
+ throw new EOFException();
+ }
+ if (b < -1 || b > 255) {
+ // Report on this.in, not argument in; see read{Header, Trailer}.
+ throw new IOException(in.getClass().getName() + ".read() returned value out of range -1..255: " + b);
+ }
+ return b;
}
- if (b < -1 || b > 255) {
- // Report on this.in, not argument in; see read{Header, Trailer}.
- throw new IOException(in.getClass().getName() + ".read() returned value out of range -1..255: " + b);
- }
- return b;
- }
}