You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2010/03/19 23:20:01 UTC
svn commit: r925461 - in /incubator/ace/trunk:
ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/
ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/
ace-deployment-task/src/main/java/or...
Author: marrs
Date: Fri Mar 19 22:20:01 2010
New Revision: 925461
URL: http://svn.apache.org/viewvc?rev=925461&view=rev
Log:
Applied r920917.
Modified:
incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ChangeNotifierImpl.java
incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentCheckTask.java
incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/Scheduler.java
incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/SchedulerTask.java
Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ChangeNotifierImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ChangeNotifierImpl.java?rev=925461&r1=925460&r2=925461&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ChangeNotifierImpl.java (original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/ChangeNotifierImpl.java Fri Mar 19 22:20:01 2010
@@ -73,7 +73,7 @@ public class ChangeNotifierImpl implemen
props = addSession(props);
m_eventAdmin.sendEvent(new Event(m_privateTopicRoot + m_entityRoot + topic,(Dictionary) props));
if (!internalOnly) {
- m_eventAdmin.postEvent(new Event(m_publicTopicRoot + m_entityRoot + topic, (Dictionary)props));
+ m_eventAdmin.postEvent(new Event(m_publicTopicRoot + m_entityRoot + topic, (Dictionary) props));
}
}
Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java?rev=925461&r1=925460&r2=925461&view=diff
==============================================================================
--- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java (original)
+++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/stateful/impl/StatefulGatewayRepositoryImpl.java Fri Mar 19 22:20:01 2010
@@ -292,7 +292,7 @@ public class StatefulGatewayRepositoryIm
}
/**
- * See {@link DeploymentRepository#getDeploymentVersion(String)}.
+ * See {@link DeploymentRepository#getDeploymentVersion(java.lang.String)}.
*/
DeploymentVersionObject getMostRecentDeploymentVersion(String gatewayID) {
return m_deploymentRepository.getMostRecentDeploymentVersion(gatewayID);
Modified: incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentCheckTask.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentCheckTask.java?rev=925461&r1=925460&r2=925461&view=diff
==============================================================================
--- incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentCheckTask.java (original)
+++ incubator/ace/trunk/ace-deployment-task/src/main/java/org/apache/ace/deployment/task/DeploymentCheckTask.java Fri Mar 19 22:20:01 2010
@@ -57,11 +57,11 @@ public class DeploymentCheckTask extends
Properties properties = new Properties();
properties.put("deploymentpackage.localversion", ((highestLocalVersion == null) ? Version.emptyVersion : highestLocalVersion));
properties.put("deploymentpackage.remoteversion", highestRemoteVersion);
- m_eventAdmin.postEvent(new Event(TOPIC_UPDATE_AVAILABLE, (Dictionary)properties));
+ m_eventAdmin.postEvent(new Event(TOPIC_UPDATE_AVAILABLE, (Dictionary) properties));
}
}
catch (MalformedURLException e) {
- m_log.log(LogService.LOG_ERROR, "Error creating endpoint url",e );
+ m_log.log(LogService.LOG_ERROR, "Error creating endpoint url", e);
}
catch (Exception e) {
m_log.log(LogService.LOG_ERROR, "Error checking for update", e);
Modified: incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/Scheduler.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/Scheduler.java?rev=925461&r1=925460&r2=925461&view=diff
==============================================================================
--- incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/Scheduler.java (original)
+++ incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/Scheduler.java Fri Mar 19 22:20:01 2010
@@ -41,6 +41,17 @@ public class Scheduler implements Manage
protected Map m_tasks = new HashMap/*<String, SchedulerTask>*/();
/**
+ * Makes sure that all tasks are indeed stopped when the scheduler is stopped.
+ */
+ public void stop() {
+ for (Iterator i = m_tasks.keySet().iterator(); i.hasNext();) {
+ String name = (String) i.next();
+ SchedulerTask schedTask = (SchedulerTask) m_tasks.get(name);
+ schedTask.stop();
+ }
+ }
+
+ /**
* Adds a new runnable to this scheduler. The runnable will be created if necessary, registered, and processed.
* @param name A name for this task.
* @param task A runnable to run for this task.
Modified: incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/SchedulerTask.java
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/SchedulerTask.java?rev=925461&r1=925460&r2=925461&view=diff
==============================================================================
--- incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/SchedulerTask.java (original)
+++ incubator/ace/trunk/ace-scheduler/src/main/java/org/apache/ace/scheduler/SchedulerTask.java Fri Mar 19 22:20:01 2010
@@ -24,8 +24,7 @@ import org.osgi.service.cm.Configuration
* Wrapper class for collecting a <code>Runnable</code> and its corresponding <code>recipe</code>(s).
* Will schedule the task when both a schedule and a <code>Runnable</code> are available.<br>
*/
-public class SchedulerTask
-{
+public class SchedulerTask {
private final String m_name;
private Runnable m_task;
private String m_description;
@@ -105,6 +104,13 @@ public class SchedulerTask
m_configurationRecipe = recipe;
}
+ public void stop() {
+ if (m_executer != null) {
+ m_executer.stop();
+ m_executer = null;
+ }
+ }
+
public boolean process() {
Object recipe = findRecipe();
if ((recipe != null) && (m_task != null)) {
@@ -119,10 +125,7 @@ public class SchedulerTask
}
else {
// there is nothing to do, since there is no recipe or task
- if (m_executer != null) {
- m_executer.stop();
- m_executer = null;
- }
+ stop();
}
m_currentRecipe = recipe;
return ((recipe != null) || (m_task != null));