uima-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r692220 - in /incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main: java/org/apache/uima/adapter/jms/client/ resources/
Date Thu, 04 Sep 2008 20:14:06 GMT
Author: eae
Date: Thu Sep  4 13:14:05 2008
New Revision: 692220

URL: http://svn.apache.org/viewvc?rev=692220&view=rev
Log:
UIMA-1165 Commit Jerry's three uimaj-as-XXX-UIMA-1165-patch.txt patch files.

Modified:
    incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
    incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
    incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java?rev=692220&r1=692219&r2=692220&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
(original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
Thu Sep  4 13:14:05 2008
@@ -56,11 +56,11 @@
 	// Global flag controlling lifecycle of this thread. It will be set to true
 	// when the
 	// uima ee engine calls doStop()
-	protected boolean done;
+	protected volatile boolean done;
 	// A reference to the uima ee client engine
 	protected BaseUIMAAsynchronousEngineCommon_impl engine;
 	// Global flag to indicate failure of the worker thread
-	protected boolean workerThreadFailed;
+	protected volatile boolean workerThreadFailed;
 	// If the worker thread fails, store the reason for the failure
 	protected Exception exception;
 

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java?rev=692220&r1=692219&r2=692220&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
(original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
Thu Sep  4 13:14:05 2008
@@ -98,34 +98,25 @@
 
 	protected static final int ProcessTimeout = 3;
 
-	protected boolean initialized;
+	protected volatile boolean initialized;
 
 	protected List listeners = new ArrayList();
 
-
 	protected AsynchAECasManager asynchManager;
 
 	protected Object endOfCollectionMonitor = new Object();
 
 	protected Object metadataReplyMonitor = new Object();
 
-
 	protected boolean remoteService = false;
 
-
-
-
-
-
 	protected Object gater = new Object();
 
 	protected int howManyBeforeReplySeen = 0;
 
-//	protected int receiveWindow = 0;
-
 	protected CollectionReader collectionReader = null;
 
-	protected boolean running = false;
+	protected volatile boolean running = false;
 
 	protected final Object sendAndReceiveCasMonitor = new Object();
 
@@ -148,12 +139,10 @@
 	//	Default timeout for CpC requests is no timeout  
 	protected int cpcTimeout = 0;
 
-	protected boolean abort = false;
+	protected volatile boolean abort = false;
 
 	protected static final String uniqueIdentifier = String.valueOf(System.nanoTime());
 
-//	protected boolean error;
-
 	protected Exception exc;
 
 	protected long howManySent = 0;
@@ -164,9 +153,9 @@
 
 	protected ConcurrentHashMap springContainerRegistry = new ConcurrentHashMap();
 
-	protected boolean receivedMetaReply;
+	protected volatile boolean receivedMetaReply;
 
-	protected boolean receivedCpcReply;
+	protected volatile boolean receivedCpcReply;
 
 	protected MessageConsumer consumer = null;
 
@@ -174,7 +163,7 @@
 		new UimaASClientInfo();
 	
 	protected List pendingMessageList = new ArrayList();
-	protected boolean producerInitialized;
+	protected volatile boolean producerInitialized;
 	abstract public String getEndPointName() throws Exception;
 	abstract protected TextMessage createTextMessage() throws Exception;
 	abstract protected void setMetaRequestMessage(TextMessage msg) throws Exception;
@@ -879,6 +868,8 @@
 				{
 					//	Send FreeCAS message to a Cas Multiplier
 					msgProducer.send(msg);
+				
+					System.out.println("------------> Client Sent Free Cas Request For CAS:"+casReferenceId+"
To:"+freeCASNotificationDestination);
 					UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINEST, CLASS_NAME.getName(), "handleProcessReplyFromCasMultiplier",
JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_client_sending_release_cas_FINEST",
 							new Object[] { freeCASNotificationDestination, message.getStringProperty(AsynchAEMessage.CasReference)
});
 				}
@@ -889,7 +880,9 @@
 				} 
 			}
 		}
+		System.out.println("------------> Client Deserializing CAS:"+casReferenceId);
 		CAS cas = deserializeCAS(((TextMessage) message).getText(), SHADOW_CAS_POOL );
+		System.out.println("++++++++++++> Client Deserialized CAS:"+casReferenceId);
 		completeProcessingReply(cas, casReferenceId, payload, true, message, inputCasCachedRequest,
null);
 	}
 
@@ -1156,6 +1149,7 @@
 				UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINEST, CLASS_NAME.getName(), "onMessage",
JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_received_process_reply_FINEST", new Object[]
{ message.getStringProperty(AsynchAEMessage.MessageFrom) });
 				handleProcessReply(message, true, null);
 			}
+			System.out.println("#### Client Completed Processing Of the Message. Waiting For Next
Message...");
 		}
 		catch (Exception e)
 		{

Modified: incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties?rev=692220&r1=692219&r2=692220&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties
(original)
+++ incubator/uima/sandbox/trunk/uima-as/uimaj-as-jms/src/main/resources/jms_adapter_messages.properties
Thu Sep  4 13:14:05 2008
@@ -149,3 +149,4 @@
 UIMAJMS_terminate_service_dueto_bad_broker__WARNING = Controller: {0} Unable To Establish
Connection To Broker: {1} - Stopping Service
 UIMAJMS_client_sending_release_cas_FINEST = Client Sent Free Cas Notification to Destination:
{0} For Cas: {1}
 UIMAJMS_activated_fcq__CONFIG = >>>> Cas Multiplier Controller: {0} Activated
Listener To Receive Free CAS Notifications From Clients - Temp Queue Name: {1}
+UIMAJMS_msg_processed__FINE = ++++ Controller: {0} Message Processing Completed [ CAS:{1}
]. Waiting For Next Message ...



Mime
View raw message