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 2015/07/31 17:46:32 UTC
svn commit: r1693619 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp:
AgentSession.java JmxAEProcessInitMonitor.java iface/IAgentSession.java
Author: cwiklik
Date: Fri Jul 31 15:46:32 2015
New Revision: 1693619
URL: http://svn.apache.org/r1693619
Log:
UIMA-4540 - force final update when JP reached Running state
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/AgentSession.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JmxAEProcessInitMonitor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/iface/IAgentSession.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/AgentSession.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/AgentSession.java?rev=1693619&r1=1693618&r2=1693619&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/AgentSession.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/AgentSession.java Fri Jul 31 15:46:32 2015
@@ -112,10 +112,10 @@ implements IAgentSession, IJobProcessMan
e.printStackTrace();
}
}
- public void notify(List<IUimaPipelineAEComponent> pipeline) {
+ public void notify(boolean forceUpdate, List<IUimaPipelineAEComponent> pipeline) {
synchronized( stateLock ) {
// Only send update if the AE is initializing
- if ( state.equals(ProcessState.Initializing)) {
+ if ( forceUpdate || state.equals(ProcessState.Initializing)) {
try {
ProcessStateUpdate processUpdate =
new ProcessStateUpdate(state, pid, duccProcessId, null, pipeline);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JmxAEProcessInitMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JmxAEProcessInitMonitor.java?rev=1693619&r1=1693618&r2=1693619&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JmxAEProcessInitMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/JmxAEProcessInitMonitor.java Fri Jul 31 15:46:32 2015
@@ -63,7 +63,7 @@ public class JmxAEProcessInitMonitor imp
running = true;
try {
aeStateList.clear();
- agent.notify(aeStateList);
+ agent.notify(true, aeStateList);
} catch (Exception ex) {
agent.logger.error("UimaAEJmxMonitor.updateAgentWhenRunning", null, ex);
}
@@ -201,7 +201,7 @@ public class JmxAEProcessInitMonitor imp
+ aeStateList.size());
}
try {
- agent.notify(aeStateList);
+ agent.notify(false, aeStateList);
} catch (Exception ex) {
throw ex;
} finally {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/iface/IAgentSession.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/iface/IAgentSession.java?rev=1693619&r1=1693618&r2=1693619&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/iface/IAgentSession.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/configuration/jp/iface/IAgentSession.java Fri Jul 31 15:46:32 2015
@@ -32,6 +32,6 @@ import org.apache.uima.ducc.transport.ev
public interface IAgentSession {
public void notify(ProcessState state);
public void notify(ProcessState state, String message);
- public void notify(List<IUimaPipelineAEComponent> pipeline);
+ public void notify(boolean forceUpdate, List<IUimaPipelineAEComponent> pipeline);
public void stop() throws Exception;
}