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 2014/06/03 18:24:39 UTC
svn commit: r1599664 - in /uima/uima-as/trunk:
uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java
uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
Author: cwiklik
Date: Tue Jun 3 16:24:38 2014
New Revision: 1599664
URL: http://svn.apache.org/r1599664
Log:
UIMA-3850 merged changes suggested by watson core group. Cosmetic changes to simplify code
Modified:
uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java
uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
Modified: uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java?rev=1599664&r1=1599663&r2=1599664&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java (original)
+++ uima/uima-as/trunk/uimaj-as-core/src/main/java/org/apache/uima/aae/delegate/Delegate.java Tue Jun 3 16:24:38 2014
@@ -887,14 +887,15 @@ public abstract class Delegate {
return concurrentConsumersOnReplyQueue;
}
+ public boolean isCasOutstanding(String aCasReferenceId) {
+ synchronized(outstandingCasList) {
+ return lookupEntry(aCasReferenceId, outstandingCasList) != null;
+ }
+ }
public boolean isGeneratingChildrenFrom(String aCasReferenceId) {
synchronized (outstandingCasList) {
DelegateEntry entry = lookupEntry(aCasReferenceId, outstandingCasList);
- if (entry == null) {
- return false;
- } else {
- return entry.isGeneratingChildren();
- }
+ return entry != null && entry.isGeneratingChildren();
}
}
Modified: uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java?rev=1599664&r1=1599663&r2=1599664&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java (original)
+++ uima/uima-as/trunk/uimaj-as-jms/src/main/java/org/apache/uima/adapter/jms/client/BaseUIMAAsynchronousEngineCommon_impl.java Tue Jun 3 16:24:38 2014
@@ -1312,8 +1312,8 @@ public abstract class BaseUIMAAsynchrono
message.getStringProperty(AsynchAEMessage.ServerIP),
message.getStringProperty(AsynchAEMessage.UimaASProcessPID));
- if (message.getJMSReplyTo() != null && serviceDelegate.isCasPendingReply(casReferenceId)) {
- casCachedRequest.setFreeCasNotificationQueue(message.getJMSReplyTo());
+ if (message.getJMSReplyTo() != null && serviceDelegate.isCasOutstanding(casReferenceId)) {
+ casCachedRequest.setFreeCasNotificationQueue(message.getJMSReplyTo());
}
} else {
ClientRequest requestToCache = (ClientRequest) clientCache.get(uniqueIdentifier);
@@ -1875,13 +1875,10 @@ public abstract class BaseUIMAAsynchrono
}
protected void removeFromCache(String aCasReferenceId) {
- if (aCasReferenceId != null && clientCache.containsKey(aCasReferenceId)) {
- ClientRequest requestToCache = (ClientRequest) clientCache.get(aCasReferenceId);
- if (requestToCache != null) {
- requestToCache.removeEntry(aCasReferenceId);
- }
+ if ( aCasReferenceId == null ) {
+ return;
+ }
clientCache.remove(aCasReferenceId);
- }
}
protected CAS deserialize(String aSerializedCAS, CAS aCAS) throws Exception {