1 files changed, 111 insertions, 20 deletions

diff --git a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
index 774880d26..5c1e35a95 100644
--- a/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
+++ b/spss/server/serverlib/src/main/java/at/gv/egovernment/moa/spss/server/transaction/TransactionContext.java
@@ -2,6 +2,7 @@ package at.gv.egovernment.moa.spss.server.transaction;
 
 import iaik.ixsil.util.URI;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -14,6 +15,7 @@ import java.util.Map.Entry;
 import org.apache.axis.attachments.ManagedMemoryDataSource;
 import org.w3c.dom.Element;
 
+import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.spss.MOAApplicationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 
@@ -37,9 +39,11 @@ public class TransactionContext {
   private Element response;
   /** The map pointing to SOAP attachments needed by the request. */
   private HashMap attachments = null;
+  /** The map containing cashed entities used in DataObjectFactory. */
+  private HashMap resolvedEntities = null;
   /** The configuration to use throughout the request. */
   private ConfigurationProvider configuration = null;
-
+  
   /**
    * Create a <code>TransactionContext</code> object.
    * 
@@ -170,6 +174,23 @@ public class TransactionContext {
   }
 
   /**
+   * Adds an attachment to the transactions list of SOAP attachments.
+   * 
+   * @param referenceId Identification value for the SOAP attachment.
+   * @param contentType MIME type of the SOAP attachment.
+   * @param is Handle to the InputStream of the SOAP attachment.
+   * @param filename Filename of the temporary file the InputStream belongs to
+   */
+  public void addAttachment(String referenceId, String contentType, InputStream is, String filename) {
+    if (this.attachments == null) this.attachments = new HashMap(); 
+    Vector entry = new Vector(3);
+    entry.add(contentType);
+    entry.add(is);
+    entry.add(filename);
+    this.attachments.put(referenceId, entry);
+  }
+  
+  /**
    * Returns the ManagedMemoryDataSource to a specific SOAP attachment identified by referenceId.
    * 
    * @param referenceId Identification value for the SOAP attachment.
@@ -182,10 +203,14 @@ public class TransactionContext {
     if (entry==null) {
       return null;
     }
-    //return (InputStream) ( ((ManagedMemoryDataSource)entry.get(1)).getInputStream());
-    return (ManagedMemoryDataSource) entry.get(1);
+    Object object = entry.get(1);
+    if (object instanceof ManagedMemoryDataSource) {
+    	return (ManagedMemoryDataSource) object;
+    } else {
+    	return null;
+    }
   }
-
+  
   /**
    * Returns the InputStream to a specific SOAP attachment identified by uri.
    * 
@@ -202,12 +227,17 @@ public class TransactionContext {
     }
 
     InputStream attachmentIs = null;
-    try {
-      attachmentIs =  (InputStream) ( ((ManagedMemoryDataSource)entry.get(1)).getInputStream());
-    } catch (IOException e) {
-      throw new MOAApplicationException("2208", new Object[] { uri }, e);
+    Object object = entry.get(1);
+       
+    if (object instanceof ManagedMemoryDataSource) {
+		try {
+		  attachmentIs =  (InputStream) ( ((ManagedMemoryDataSource)object).getInputStream());
+		} catch (IOException e) {
+		  throw new MOAApplicationException("2208", new Object[] { uri }, e);
+		}
+    } else {
+        attachmentIs = (InputStream) object;
     }
-
     return attachmentIs;
     //If we would return the whole mmds: return (ManagedMemoryDataSource) entry.get(1);
   }
@@ -236,17 +266,32 @@ public void cleanAttachmentCache() {
     while (iterator.hasNext()) {
       Entry hmEntry = (Entry) iterator.next();
       Vector entry = (Vector)hmEntry.getValue();
-      ManagedMemoryDataSource mmds = (ManagedMemoryDataSource)entry.get(1);
-      try {
-        if (mmds!=null) {
-          InputStream is = mmds.getInputStream();
-          if (is!=null) is.close();
-          File f = mmds.getDiskCacheFile();
-          if (f!=null) f.delete();
-          mmds.delete();
-        }
-      } catch (IOException e) {
-        // ok to do nothing here
+      Object object = entry.get(1);
+      if (object instanceof ManagedMemoryDataSource) {
+	      ManagedMemoryDataSource mmds = (ManagedMemoryDataSource)object;
+	      try {
+	        if (mmds!=null) {
+	          InputStream is = mmds.getInputStream();
+	          if (is!=null) is.close();
+	          File f = mmds.getDiskCacheFile();
+	          if (f!=null) f.delete();
+	          mmds.delete();
+	        }
+	      } catch (IOException e) {
+	        // ok to do nothing here
+	      }
+      } else if (object instanceof InputStream) {
+         InputStream is = (InputStream)object;
+         try {
+	         if (is!=null) is.close();
+	         String tempFile = (String) entry.get(2);
+	         if (tempFile!=null){
+		         File f = new File(tempFile);
+		         f.delete();
+	         }
+	      } catch (IOException e) {
+		        // ok to do nothing here
+	      }
       }
     }
   }
@@ -261,4 +306,50 @@ public void cleanAttachmentCache() {
     return configuration;
   }
   
+  /**
+   * Search an uri content in cashed map.
+   * 
+   * @param uri The value to look for.
+   * @return If found the cached entity, <code>null<code> otherwise.
+   */
+  public Vector FindResolvedEntity(String uri) {
+	  if (resolvedEntities==null) return null;
+	  return (Vector) resolvedEntities.get(uri);
+  }
+  
+  /**
+   * Get a new InputStream of a cached entity.
+   * 
+   * @param uri The value to look for.
+   * @return A new InputStream of the cached entity.
+   */
+  public InputStream ResolveURI(String uri) {
+	  InputStream is = null;
+	  Vector entity = FindResolvedEntity(uri);
+	  if (entity!=null) {
+		  byte[] contentBytes = (byte[]) entity.get(0);
+		  if (contentBytes!=null) {
+			  is = new ByteArrayInputStream(contentBytes);
+		  }
+	  }
+      return is;
+  }
+
+  /**
+   * Put a read entity (supplement, detached content, data object) on 
+   * transactions entity cash, to prevent repeated reading on slower channels.
+   * 
+   * @param uri A transaction-wide unique URI used as key of the entity cash 
+   * table.
+   * @param contentBytes The cached content belonging to the uri.
+   * @param contentType If known, the MIME-type of the cashed content.
+   */
+  public void PutResolvedEntity(String uri, byte[] contentBytes, String contentType) {
+	  Logger.trace("    storing uri content of uri \"" + uri + "\" for future references");
+	  if (resolvedEntities==null) resolvedEntities = new HashMap();
+      Vector entity = new Vector();
+      entity.add(contentBytes);
+      entity.add(contentType);
+      resolvedEntities.put(uri, entity);
+  }
 }