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/06/20 22:23:48 UTC
svn commit: r670054 - in
/incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms:
client/BaseMessageSender.java
client/BaseUIMAAsynchronousEngineCommon_impl.java
message/JmsMessageContext.java
Author: eae
Date: Fri Jun 20 13:23:48 2008
New Revision: 670054
URL: http://svn.apache.org/viewvc?rev=670054&view=rev
Log:
UIMA-1084 Commit Jerry's patch files
Modified:
incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java
Modified: incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java?rev=670054&r1=670053&r2=670054&view=diff
==============================================================================
--- incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java (original)
+++ incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseMessageSender.java Fri Jun 20 13:23:48 2008
@@ -177,11 +177,11 @@
// will call
// doStop() which sets the global flag 'done' to true.
while (!done) {
- // First check if there are any pending messages in the shared
- // 'queue'
- if (pendingMessageList.size() == 0) {
+ synchronized (pendingMessageList) {
+ // First check if there are any pending messages in the shared
+ // 'queue'
+ if (pendingMessageList.size() == 0) {
// Block waiting for a message
- synchronized (pendingMessageList) {
try {
pendingMessageList.wait(0);
} catch (InterruptedException e) {
Modified: incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java?rev=670054&r1=670053&r2=670054&view=diff
==============================================================================
--- incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java (original)
+++ incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java Fri Jun 20 13:23:48 2008
@@ -790,7 +790,6 @@
return;
}
-// System.out.println(">>>>>>>>>>>>>> Client Handling Reply With Cas:"+casReferenceId);
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINEST, CLASS_NAME.getName(), "handleProcessReply", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_handling_process_reply_FINEST",
new Object[] { message.getStringProperty(AsynchAEMessage.MessageFrom), message.getStringProperty(AsynchAEMessage.CasReference) });
Modified: incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java?rev=670054&r1=670053&r2=670054&view=diff
==============================================================================
--- incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java (original)
+++ incubator/uima/sandbox/branches/uima-as-post1st/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/message/JmsMessageContext.java Fri Jun 20 13:23:48 2008
@@ -95,17 +95,8 @@
String msgFrom = (String)aMessage.getStringProperty(AsynchAEMessage.MessageFrom);
if ( msgFrom != null )
{
- UIMAFramework.getLogger(CLASS_NAME).logrb(Level.FINE, CLASS_NAME.getName(),
- "JmsMessageContext", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_recvd_message_from__FINE",
- new Object[] { msgFrom, aMessage.getStringProperty(UIMAMessage.ServerURI) });
endpoint.setEndpoint( msgFrom);
}
- else
- {
- // Undefined sender of the message. This may be ok.
- UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, CLASS_NAME.getName(),
- "JmsMessageContext", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_reply_queue_not_defined__WARNING");
- }
if ( aMessage.getJMSReplyTo() != null )
{
endpoint.setDestination(aMessage.getJMSReplyTo());
@@ -118,11 +109,6 @@
endpoint.setServerURI(selectedServerURI);
endpoint.setRemote(endpoint.getServerURI().startsWith("vm")==false);
}
- else if ( aMessage.getIntProperty(AsynchAEMessage.MessageType) != AsynchAEMessage.Response)
- {
- UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, CLASS_NAME.getName(),
- "JmsMessageContext", JmsConstants.JMS_LOG_RESOURCE_BUNDLE, "UIMAJMS_reply_queue_server_not_defined__WARNING");
- }
}
catch( Exception e)
{