You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2017/07/28 18:58:04 UTC
svn commit: r1803322 - in /uima/uima-as/trunk:
uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java
uimaj-as-core/src/main/resources/uimaee_messages.properties
Author: cwiklik
Date: Fri Jul 28 18:58:04 2017
New Revision: 1803322
URL: http://svn.apache.org/viewvc?rev=1803322&view=rev
Log:
UIMA-5512 Fixed logging when jms send fais due to an invalid destination
Modified:
uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java
uima/uima-as/trunk/uimaj-as-core/src/main/resources/uimaee_messages.properties
Modified: uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java?rev=1803322&r1=1803321&r2=1803322&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/src/main/java/org/apache/uima/adapter/jms/activemq/JmsEndpointConnection_impl.java Fri Jul 28 18:58:04 2017
@@ -757,7 +757,7 @@ public class JmsEndpointConnection_impl
if ( command == AsynchAEMessage.ServiceInfo ) {
return false;
}
- if ( (msgType == AsynchAEMessage.Response || msgType == AsynchAEMessage.Request ) &&
+ if ( (msgType == AsynchAEMessage.Response || msgType == AsynchAEMessage.Request ) &&
command == AsynchAEMessage.Process ) {
String casReferenceId="";
try {
@@ -766,7 +766,7 @@ public class JmsEndpointConnection_impl
String key = "";
String endpointName = "";
if ( delegateEndpoint != null ) {
- delegateEndpoint.getDelegateKey();
+ key = delegateEndpoint.getDelegateKey();
endpointName = ((ActiveMQDestination) delegateEndpoint.getDestination())
.getPhysicalName();
}
@@ -783,20 +783,22 @@ public class JmsEndpointConnection_impl
if (UIMAFramework.getLogger(CLASS_NAME).isLoggable(Level.WARNING)) {
-
+
String key = "";
String endpointName = "";
if ( delegateEndpoint != null ) {
- delegateEndpoint.getDelegateKey();
+ key = delegateEndpoint.getDelegateKey();
endpointName = ((ActiveMQDestination) delegateEndpoint.getDestination())
.getPhysicalName();
- }
+
+ }
if ( "Client".equals(target) ) {
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, CLASS_NAME.getName(),
"send", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
"UIMAEE_service_delivery_to_client_exception__WARNING",
new Object[] { controller.getComponentName(),endpointName });
} else {
+
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, CLASS_NAME.getName(),
"send", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
"UIMAEE_service_delivery_exception__WARNING",new Object[] { controller.getComponentName(), key, endpointName});
@@ -1023,8 +1025,8 @@ public class JmsEndpointConnection_impl
}
} else {
UIMAFramework.getLogger(CLASS_NAME).logrb(Level.WARNING, CLASS_NAME.getName(),
- "send", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
- "UIMAEE_service_delivery_exception__WARNING",new Object[] { controller.getComponentName(), "", endpointName});
+ "UimaAsAsyncCallbackListener.onException()", UIMAEE_Constants.JMS_LOG_RESOURCE_BUNDLE,
+ "UIMAEE_service_delivery_exception_WARNING",new Object[] { controller.getComponentName(), exception} );
}
}
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/resources/uimaee_messages.properties
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/resources/uimaee_messages.properties?rev=1803322&r1=1803321&r2=1803322&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/resources/uimaee_messages.properties (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/resources/uimaee_messages.properties Fri Jul 28 18:58:04 2017
@@ -268,4 +268,5 @@ UIMAEE_warmup_dropping_cas__FINE = Aggre
UIMAEE_warmup_start_cas__FINE = Aggregate Warmup Stage - Processing CAS id:{0}
UIMAEE_delivery_to_client_failed_INFO = Service:{0} Unable to Deliver CAS:{1} to Client - Dropping CAS
UIMAEE_unable_to_deliver_msg__INFO=Service:{0} JMS unable to Deliver CAS:{1} - Error:{2}
-UIMAEE_force_cas_abort__INFO="Service:{0} Forcing {1} CAS:{1} to Abort
\ No newline at end of file
+UIMAEE_force_cas_abort__INFO="Service:{0} Forcing {1} CAS:{1} to Abort
+UIMAEE_service_delivery_exception_WARNING=Service:{0} Handling Exception:{1}
\ No newline at end of file