You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ea...@apache.org on 2008/07/22 22:01:39 UTC

svn commit: r678877 - /incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java

Author: eae
Date: Tue Jul 22 13:01:39 2008
New Revision: 678877

URL: http://svn.apache.org/viewvc?rev=678877&view=rev
Log:
UIMA-1104 Commit JC patch 12

Modified:
    incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java

Modified: incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java?rev=678877&r1=678876&r2=678877&view=diff
==============================================================================
--- incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java (original)
+++ incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsOutputChannel.java Tue Jul 22 13:01:39 2008
@@ -924,7 +924,6 @@
 			else
 			{
 				CacheEntry entry = getAnalysisEngineController().getInProcessCache().getCacheEntryForCAS(aCasReferenceId);
-//				long t1 = System.nanoTime();
 				long t1 = getAnalysisEngineController().getCpuTime();
 				//	Serialize CAS for remote Delegates
 				String serializer = anEndpoint.getSerializer();
@@ -933,8 +932,10 @@
 					serializer = "xmi";
 				}
 				serializedCAS = serializeCAS(isReply, cas, aCasReferenceId, serializer);
-//				long timeToSerializeCas = System.nanoTime()-t1;
 				long timeToSerializeCas = getAnalysisEngineController().getCpuTime()-t1;
+				
+				getAnalysisEngineController().incrementSerializationTime(timeToSerializeCas);
+				
 				entry.incrementTimeToSerializeCAS(timeToSerializeCas);
 				casStats.incrementCasSerializationTime(timeToSerializeCas);
 				getAnalysisEngineController().getServicePerformance().
@@ -959,37 +960,6 @@
 		CAS cas = null;
 		try
 		{
-			
-			
-/*			
-			String serializedCAS = null;
-			//	Using Cas reference Id retrieve CAS from the shared Cash
-			cas = getAnalysisEngineController().getInProcessCache().getCasByReference(aCasReferenceId);
-
-			if ( cas == null )
-			{
-				serializedCAS = getAnalysisEngineController().getInProcessCache().getSerializedCAS( aCasReferenceId );
-			}
-			else
-			{
-				CacheEntry entry = getAnalysisEngineController().getInProcessCache().getCacheEntryForCAS(aCasReferenceId);
-				long t1 = System.nanoTime();
-				//	Serialize CAS for remote Delegates
-				String serializer = anEndpoint.getSerializer();
-				if ( serializer == null || serializer.trim().length() == 0)
-				{
-					serializer = "xmi";
-				}
-				serializedCAS = serializeCAS(isReply, cas, aCasReferenceId, serializer);
-				entry.incrementTimeToSerializeCAS(System.nanoTime()-t1);
-				if ( cacheSerializedCas )
-				{
-					getAnalysisEngineController().getInProcessCache().saveSerializedCAS(aCasReferenceId, serializedCAS);
-				}
-			}
-			return serializedCAS;
-*/			
-
 			return getSerializedCas(isReply, aCasReferenceId, anEndpoint, cacheSerializedCas);
 		}
 		catch( Exception e)
@@ -1020,7 +990,6 @@
 	{
 		if ( anEndpoint.isFinal() )
 		{
-			//aTextMessage.setLongProperty(AsynchAEMessage.TotalTimeSpentInAnalytic, (System.nanoTime()-anEndpoint.getEntryTime()));
 			aTextMessage.setLongProperty("SENT-TIME", System.nanoTime());
 		}