Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-sig

# Conflicts:
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
#	moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationProvider.java

1 files changed, 50 insertions, 50 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ResetableInputStreamWrapper.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ResetableInputStreamWrapper.java
index 243cd5d..f0e5326 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ResetableInputStreamWrapper.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/util/ResetableInputStreamWrapper.java
@@ -6,54 +6,54 @@ import java.io.InputStream;
 
 public class ResetableInputStreamWrapper extends InputStream {
 
-	private ByteArrayInputStream bais;
-	
-	public ResetableInputStreamWrapper(ByteArrayInputStream bais) {
-		this.bais = bais;
-	}
-	
-	@Override
-	public int read() throws IOException {
-		return this.bais.read();
-	}
-
-	@Override
-	public int read(byte[] b) throws IOException {
-		return this.bais.read(b);
-	}
-
-	@Override
-	public int read(byte[] b, int off, int len) throws IOException {
-		return this.bais.read(b, off, len);
-	}
-
-	@Override
-	public long skip(long n) throws IOException {
-		return this.bais.skip(n);
-	}
-
-	@Override
-	public int available() throws IOException {
-		return this.bais.available();
-	}
-
-	@Override
-	public void close() throws IOException {
-		this.bais.close();
-	}
-
-	@Override
-	public synchronized void mark(int readlimit) {
-		this.bais.mark(readlimit);
-	}
-
-	@Override
-	public synchronized void reset() throws IOException {
-		this.bais.reset();
-	}
-
-	@Override
-	public boolean markSupported() {
-		return this.bais.markSupported();
-	}
+  private final ByteArrayInputStream bais;
+
+  public ResetableInputStreamWrapper(ByteArrayInputStream bais) {
+    this.bais = bais;
+  }
+
+  @Override
+  public int read() throws IOException {
+    return this.bais.read();
+  }
+
+  @Override
+  public int read(byte[] b) throws IOException {
+    return this.bais.read(b);
+  }
+
+  @Override
+  public int read(byte[] b, int off, int len) throws IOException {
+    return this.bais.read(b, off, len);
+  }
+
+  @Override
+  public long skip(long n) throws IOException {
+    return this.bais.skip(n);
+  }
+
+  @Override
+  public int available() throws IOException {
+    return this.bais.available();
+  }
+
+  @Override
+  public void close() throws IOException {
+    this.bais.close();
+  }
+
+  @Override
+  public synchronized void mark(int readlimit) {
+    this.bais.mark(readlimit);
+  }
+
+  @Override
+  public synchronized void reset() throws IOException {
+    this.bais.reset();
+  }
+
+  @Override
+  public boolean markSupported() {
+    return this.bais.markSupported();
+  }
 }