1 files changed, 47 insertions, 31 deletions
diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java
index 0796078f..75eee27f 100644
--- a/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java
+++ b/pdf-as-lib/src/main/java/at/gv/egiz/pdfas/lib/impl/status/OperationStatus.java
@@ -36,39 +36,53 @@ import at.gv.egiz.pdfas.lib.impl.configuration.PlaceholderConfiguration;
 import at.gv.egiz.pdfas.lib.impl.configuration.SignatureProfileConfiguration;
 
 public class OperationStatus implements Serializable {
-	
+
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = -2985007198666388528L;
-	
-	
+
 	private SignParameter signParamter;
 	private PDFObject pdfObject = new PDFObject(this);
-	
+
 	private ISettings configuration;
 	private PlaceholderConfiguration placeholderConfiguration = null;
 	private GlobalConfiguration gloablConfiguration = null;
-	private Map<String, SignatureProfileConfiguration> signatureProfiles = 
-				new HashMap<String, SignatureProfileConfiguration>();
+	private Map<String, SignatureProfileConfiguration> signatureProfiles = new HashMap<String, SignatureProfileConfiguration>();
 	private TempFileHelper helper;
 	private RequestedSignature requestedSignature;
 	private Calendar signingDate;
-	
+
 	public OperationStatus(ISettings configuration, SignParameter signParameter) {
 		this.configuration = configuration;
 		this.signParamter = signParameter;
 		helper = new TempFileHelper(configuration);
 	}
-	
+
 	@Override
 	protected void finalize() throws Throwable {
+		if (this.helper != null) {
+			try {
+				this.helper.clear();
+			} catch (Throwable e) {
+			}
+		}
 		super.finalize();
 	}
-	
-	
-	
+
 	// ========================================================================
+
+	public void clear() {
+		if (this.helper != null) {
+			try {
+				this.helper.clear();
+			} catch (Throwable e) {
+			}
+		}
+		if(pdfObject != null) {
+			pdfObject.close();
+		}
+	}
 	
 	public RequestedSignature getRequestedSignature() {
 		return requestedSignature;
@@ -79,34 +93,37 @@ public class OperationStatus implements Serializable {
 	}
 
 	public PlaceholderConfiguration getPlaceholderConfiguration() {
-		if(this.placeholderConfiguration == null) {
-			this.placeholderConfiguration = 
-					new PlaceholderConfiguration(this.configuration);
+		if (this.placeholderConfiguration == null) {
+			this.placeholderConfiguration = new PlaceholderConfiguration(
+					this.configuration);
 		}
 		return this.placeholderConfiguration;
 	}
-	
+
 	public GlobalConfiguration getGlobalConfiguration() {
-		if(this.gloablConfiguration == null) {
-			this.gloablConfiguration = 
-					new GlobalConfiguration(this.configuration);
+		if (this.gloablConfiguration == null) {
+			this.gloablConfiguration = new GlobalConfiguration(
+					this.configuration);
 		}
 		return this.gloablConfiguration;
 	}
-	
-	public SignatureProfileConfiguration getSignatureProfileConfiguration(String profileID) {
-		
-		SignatureProfileConfiguration signatureProfileConfiguration = signatureProfiles.get(profileID);
-		if(signatureProfileConfiguration == null) {
-			signatureProfileConfiguration = new SignatureProfileConfiguration(this.configuration, profileID);
+
+	public SignatureProfileConfiguration getSignatureProfileConfiguration(
+			String profileID) {
+
+		SignatureProfileConfiguration signatureProfileConfiguration = signatureProfiles
+				.get(profileID);
+		if (signatureProfileConfiguration == null) {
+			signatureProfileConfiguration = new SignatureProfileConfiguration(
+					this.configuration, profileID);
 			signatureProfiles.put(profileID, signatureProfileConfiguration);
 		}
-		
+
 		return signatureProfileConfiguration;
 	}
-	
+
 	// ========================================================================
-	
+
 	public PDFObject getPdfObject() {
 		return pdfObject;
 	}
@@ -122,11 +139,11 @@ public class OperationStatus implements Serializable {
 	public void setSignParamter(SignParameter signParamter) {
 		this.signParamter = signParamter;
 	}
-	
+
 	public TempFileHelper getTempFileHelper() {
 		return this.helper;
 	}
-	
+
 	public ISettings getSettings() {
 		return this.configuration;
 	}
@@ -138,6 +155,5 @@ public class OperationStatus implements Serializable {
 	public void setSigningDate(Calendar signingDate) {
 		this.signingDate = signingDate;
 	}
-	
-	
+
 }