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, 31 insertions, 32 deletions

diff --git a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/DeleteableDataSourceWrapper.java b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/DeleteableDataSourceWrapper.java
index 1d49cd7..f5350af 100644
--- a/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/DeleteableDataSourceWrapper.java
+++ b/moaSig/moa-sig/src/main/java/at/gv/egovernment/moa/spss/server/service/DeleteableDataSourceWrapper.java
@@ -8,36 +8,35 @@ import at.gv.egovernment.moa.spss.server.transaction.DeleteableDataSource;
 
 public class DeleteableDataSourceWrapper implements DeleteableDataSource {
 
-	private org.apache.axis.attachments.ManagedMemoryDataSource wrapped;
-	
-	public DeleteableDataSourceWrapper(org.apache.axis.attachments.ManagedMemoryDataSource wrapped) {
-		this.wrapped = wrapped;
-	}
-
-	@Override
-	public String getContentType() {
-		return this.wrapped.getContentType();
-	}
-
-	@Override
-	public InputStream getInputStream() throws IOException {
-		return this.wrapped.getInputStream();
-	}
-
-	@Override
-	public String getName() {
-		return this.wrapped.getName();
-	}
-
-	@Override
-	public OutputStream getOutputStream() throws IOException {
-		return this.wrapped.getOutputStream();
-	}
-
-	@Override
-	public void delete() {
-		this.wrapped.delete();
-	}
-	
-	
+  private final org.apache.axis.attachments.ManagedMemoryDataSource wrapped;
+
+  public DeleteableDataSourceWrapper(org.apache.axis.attachments.ManagedMemoryDataSource wrapped) {
+    this.wrapped = wrapped;
+  }
+
+  @Override
+  public String getContentType() {
+    return this.wrapped.getContentType();
+  }
+
+  @Override
+  public InputStream getInputStream() throws IOException {
+    return this.wrapped.getInputStream();
+  }
+
+  @Override
+  public String getName() {
+    return this.wrapped.getName();
+  }
+
+  @Override
+  public OutputStream getOutputStream() throws IOException {
+    return this.wrapped.getOutputStream();
+  }
+
+  @Override
+  public void delete() {
+    this.wrapped.delete();
+  }
+
 }