1 files changed, 69 insertions, 55 deletions
diff --git a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
index 824416f..2ccc1b7 100644
--- a/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
+++ b/src/main/java/at/gv/egiz/pdfas/impl/api/PdfAsObject.java
@@ -50,6 +50,7 @@ import at.gv.egiz.pdfas.utils.ConfigUtils;
 import at.knowcenter.wag.egov.egiz.PdfAS;
 import at.knowcenter.wag.egov.egiz.PdfASID;
 import at.knowcenter.wag.egov.egiz.cfg.SettingsReader;
+import at.knowcenter.wag.egov.egiz.exceptions.OutOfMemoryException;
 import at.knowcenter.wag.egov.egiz.exceptions.PDFDocumentException;
 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;
 import at.knowcenter.wag.egov.egiz.exceptions.SignatureException;
@@ -240,20 +241,24 @@ public class PdfAsObject implements PdfAs
     TablePos pos = PosHelper.formTablePos(signParameters.getSignaturePositioning());
 
     String connectorId = CommandlineConnectorChooser.chooseCommandlineConnectorForSign(signParameters.getSignatureDevice());
- 
-    SignatorInformation si = PdfAS.signCommandline(
-          new PdfDataSourceAdapter(signParameters.getDocument()),
-          new DataSinkAdapter(signParameters.getOutput()),
-          signatorId,
-          connectorId,
-          signParameters.getSignatureProfileId(),
-          signParameters.getSignatureKeyIdentifier(),
-          pos,
-          signParameters.getTimeStamperImpl()
-    );
-
-    return new SignResultImpl(signParameters.getOutput(), si.getSignSignatureObject().getX509Certificate(),
-          new ActualSignaturePositionAdapter(si.getActualTablePos()), si.getNonTextualObjects());
+
+    try {
+       SignatorInformation si = PdfAS.signCommandline(
+             new PdfDataSourceAdapter(signParameters.getDocument()),
+             new DataSinkAdapter(signParameters.getOutput()),
+             signatorId,
+             connectorId,
+             signParameters.getSignatureProfileId(),
+             signParameters.getSignatureKeyIdentifier(),
+             pos,
+             signParameters.getTimeStamperImpl()
+       );
+       return new SignResultImpl(signParameters.getOutput(), si.getSignSignatureObject().getX509Certificate(),
+             new ActualSignaturePositionAdapter(si.getActualTablePos()), si.getNonTextualObjects());
+    } catch (java.lang.OutOfMemoryError e) {
+       throw new OutOfMemoryException(ErrorCode.OUT_OF_MEMORY_ERROR, "Insufficient memory allocated to virtual machine. Start Java with parameters \"-Xms128m -Xmx786m -XX:MaxPermSize=256m\".", e);
+    }
+
   }
 
   /**
@@ -364,31 +369,35 @@ public class PdfAsObject implements PdfAs
     }
     assert inputDataSource != null;
     
-    ExtractionStage es = new ExtractionStage();
-    List signature_holders = es.extractSignatureHolders(inputDataSource, parameters);
-
-//    List sigInfs = new ArrayList(signature_holders.size());
-    List sigInfs = new ArrayList();
-    List noSigs = new ArrayList();
-    Iterator it = signature_holders.iterator();
-    while (it.hasNext())
-    {
-      SignatureHolder sh = (SignatureHolder)it.next();
-      
-      if(sh instanceof NoSignatureHolder) {
-        noSigs.add(sh);
-      } else {
-      
-        SignatureInformation si = new SignatureInformationAdapter(sh);
-        sigInfs.add(si);
-        if (analyzeParameters.isReturnNonTextualObjects()) {           
-           si.setNonTextualObjects(doExtractNonTexualObjects(sh, (PdfDataSource) inputDataSource));           
-        }        
-        
-      }
+    try {
+       ExtractionStage es = new ExtractionStage();
+       List signature_holders = es.extractSignatureHolders(inputDataSource, parameters);
+   
+   //    List sigInfs = new ArrayList(signature_holders.size());
+       List sigInfs = new ArrayList();
+       List noSigs = new ArrayList();
+       Iterator it = signature_holders.iterator();
+       while (it.hasNext())
+       {
+         SignatureHolder sh = (SignatureHolder)it.next();
+         
+         if(sh instanceof NoSignatureHolder) {
+           noSigs.add(sh);
+         } else {
+         
+           SignatureInformation si = new SignatureInformationAdapter(sh);
+           sigInfs.add(si);
+           if (analyzeParameters.isReturnNonTextualObjects()) {           
+              si.setNonTextualObjects(doExtractNonTexualObjects(sh, (PdfDataSource) inputDataSource));           
+           }        
+           
+         }
+       }
+       return new AnalyzeResultImpl(sigInfs, noSigs);
+    } catch (java.lang.OutOfMemoryError e) {
+       throw new OutOfMemoryException(ErrorCode.OUT_OF_MEMORY_ERROR, "Insufficient memory allocated to virtual machine. Start Java with parameters \"-Xms128m -Xmx786m -XX:MaxPermSize=256m\".", e);
     }
     
-    return new AnalyzeResultImpl(sigInfs, noSigs);
   }
 
   private List doExtractNonTexualObjects(SignatureHolder sh, PdfDataSource pdfDataSource) {
@@ -433,25 +442,30 @@ public class PdfAsObject implements PdfAs
     }
     assert signature_holders.size() == signatures.size();
     
-    List results = PdfAS.verifySignatureHolders(signature_holders, verifyAfterAnalysisParameters.getSignatureDevice(), verifyAfterAnalysisParameters.isReturnHashInputData(), verifyAfterAnalysisParameters.getVerificationTime());
-    
-    List vrs = new ArrayList(results.size());
-    
-    assert signature_holders.size() == results.size() : "Not all signatures were verified.";
-
-    for (int i = 0; i < signature_holders.size(); i++)
-    {
-      SignatureResponse response = (SignatureResponse) results.get(i);
-      SignatureHolder holder = (SignatureHolder) signature_holders.get(i);
-
-      VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterAnalysisParameters.getVerificationTime());
-      vr.setNonTextualObjects( ((SignatureInformation) signatures.get(i)).getNonTextualObjects());
-
-      vrs.add(vr);
+    try {
+       List results = PdfAS.verifySignatureHolders(signature_holders, verifyAfterAnalysisParameters.getSignatureDevice(), verifyAfterAnalysisParameters.isReturnHashInputData(), verifyAfterAnalysisParameters.getVerificationTime());
+       
+       List vrs = new ArrayList(results.size());
+       
+       assert signature_holders.size() == results.size() : "Not all signatures were verified.";
+   
+       for (int i = 0; i < signature_holders.size(); i++)
+       {
+         SignatureResponse response = (SignatureResponse) results.get(i);
+         SignatureHolder holder = (SignatureHolder) signature_holders.get(i);
+   
+         VerifyResult vr = new VerifyResultAdapter(response, holder, verifyAfterAnalysisParameters.getVerificationTime());
+         vr.setNonTextualObjects( ((SignatureInformation) signatures.get(i)).getNonTextualObjects());
+   
+         vrs.add(vr);
+       }
+       
+       VerifyResultsImpl verifyResults = new VerifyResultsImpl(vrs); 
+       return verifyResults;
+    } catch (java.lang.OutOfMemoryError e) {
+       throw new OutOfMemoryException(ErrorCode.OUT_OF_MEMORY_ERROR, "Insufficient memory allocated to virtual machine. Start Java with parameters \"-Xms128m -Xmx786m -XX:MaxPermSize=256m\".", e);
     }
-    
-    VerifyResultsImpl verifyResults = new VerifyResultsImpl(vrs); 
-    return verifyResults;
+       
   }
 
 }