[openrtm-commit:02782] r1030 - trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/publisher
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 8月 30日 (水) 11:03:21 JST
Author: t-katami
Date: 2017-08-30 11:03:21 +0900 (Wed, 30 Aug 2017)
New Revision: 1030
Modified:
trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/publisher/PublisherNew.java
trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/publisher/PublisherPeriodic.java
Log:
[compat,bugfix,->releng_1_2] fixed the bug. refs #4111
Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/publisher/PublisherNew.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/publisher/PublisherNew.java 2017-08-30 01:02:12 UTC (rev 1029)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/publisher/PublisherNew.java 2017-08-30 02:03:21 UTC (rev 1030)
@@ -39,7 +39,7 @@
m_buffer = null;
m_task = null;
m_retcode = ReturnCode.PORT_OK;
- m_pushPolicy = Policy.NEW;
+ m_pushPolicy = Policy.PUBLISHER_POLICY_NEW;
m_skipn = 0;
m_active = false;
m_leftskip = 0;
@@ -75,16 +75,16 @@
public int svc() {
synchronized (m_retmutex) {
switch (m_pushPolicy) {
- case ALL:
+ case PUBLISHER_POLICY_ALL:
m_retcode = pushAll();
break;
- case FIFO:
+ case PUBLISHER_POLICY_FIFO:
m_retcode = pushFifo();
break;
- case SKIP:
+ case PUBLISHER_POLICY_SKIP:
m_retcode = pushSkip();
break;
- case NEW:
+ case PUBLISHER_POLICY_NEW:
m_retcode = pushNew();
break;
default:
@@ -329,27 +329,27 @@
* @param prop Properties
*/
protected void setPushPolicy(final Properties prop) {
- // push_policy default: NEW
+ // push_policy default: PUBLISHER_POLICY_NEW
String push_policy = prop.getProperty("publisher.push_policy", "new");
rtcout.println(Logbuf.DEBUG, "push_policy: " + push_policy );
push_policy = StringUtil.normalize(push_policy);
if (push_policy.equals("all")) {
- m_pushPolicy = Policy.ALL;
+ m_pushPolicy = Policy.PUBLISHER_POLICY_ALL;
}
else if (push_policy.equals("fifo")) {
- m_pushPolicy = Policy.FIFO;
+ m_pushPolicy = Policy.PUBLISHER_POLICY_FIFO;
}
else if (push_policy.equals("skip")) {
- m_pushPolicy = Policy.SKIP;
+ m_pushPolicy = Policy.PUBLISHER_POLICY_SKIP;
}
else if (push_policy.equals("new")) {
- m_pushPolicy = Policy.NEW;
+ m_pushPolicy = Policy.PUBLISHER_POLICY_NEW;
}
else {
rtcout.println(Logbuf.ERROR,
"invalid push_policy value: " + push_policy );
- m_pushPolicy = Policy.NEW; // default push policy
+ m_pushPolicy = Policy.PUBLISHER_POLICY_NEW; // default push policy
}
// skip_count default: 0
@@ -752,10 +752,10 @@
protected Logbuf rtcout;
protected enum Policy {
- ALL,
- FIFO,
- SKIP,
- NEW
+ PUBLISHER_POLICY_ALL,
+ PUBLISHER_POLICY_FIFO,
+ PUBLISHER_POLICY_SKIP,
+ PUBLISHER_POLICY_NEW
}
/**
* <p> Connector data listener functions </p>
Modified: trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/publisher/PublisherPeriodic.java
===================================================================
--- trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/publisher/PublisherPeriodic.java 2017-08-30 01:02:12 UTC (rev 1029)
+++ trunk/OpenRTM-aist-Java/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/port/publisher/PublisherPeriodic.java 2017-08-30 02:03:21 UTC (rev 1030)
@@ -36,7 +36,7 @@
m_buffer = null;
m_task = null;
m_retcode = ReturnCode.PORT_OK;
- m_pushPolicy = Policy.NEW;
+ m_pushPolicy = Policy.PUBLISHER_POLICY_NEW;
m_skipn = 0;
m_active = false;
m_readback = false;
@@ -56,16 +56,16 @@
public int svc() {
synchronized (m_retmutex) {
switch (m_pushPolicy) {
- case ALL:
+ case PUBLISHER_POLICY_ALL:
m_retcode = pushAll();
break;
- case FIFO:
+ case PUBLISHER_POLICY_FIFO:
m_retcode = pushFifo();
break;
- case SKIP:
+ case PUBLISHER_POLICY_SKIP:
m_retcode = pushSkip();
break;
- case NEW:
+ case PUBLISHER_POLICY_NEW:
m_retcode = pushNew();
break;
default:
@@ -341,27 +341,27 @@
* <p> Setting PushPolicy </p>
*/
protected void setPushPolicy(final Properties prop) {
- // push_policy default: NEW
+ // push_policy default: PUBLISHER_POLICY_NEW
String push_policy = prop.getProperty("publisher.push_policy", "periodic");
rtcout.println(Logbuf.DEBUG, "push_policy: " + push_policy );
push_policy = StringUtil.normalize(push_policy);
if (push_policy.equals("all")) {
- m_pushPolicy = Policy.ALL;
+ m_pushPolicy = Policy.PUBLISHER_POLICY_ALL;
}
else if (push_policy.equals("fifo")) {
- m_pushPolicy = Policy.FIFO;
+ m_pushPolicy = Policy.PUBLISHER_POLICY_FIFO;
}
else if (push_policy.equals("skip")) {
- m_pushPolicy = Policy.SKIP;
+ m_pushPolicy = Policy.PUBLISHER_POLICY_SKIP;
}
else if (push_policy.equals("new")) {
- m_pushPolicy = Policy.NEW;
+ m_pushPolicy = Policy.PUBLISHER_POLICY_NEW;
}
else {
rtcout.println(Logbuf.ERROR,
"invalid push_policy value: " + push_policy );
- m_pushPolicy = Policy.NEW; // default push policy
+ m_pushPolicy = Policy.PUBLISHER_POLICY_NEW; // default push policy
}
// skip_count default: 0
@@ -760,10 +760,10 @@
*/
protected Logbuf rtcout;
protected enum Policy {
- ALL,
- FIFO,
- SKIP,
- NEW
+ PUBLISHER_POLICY_ALL,
+ PUBLISHER_POLICY_FIFO,
+ PUBLISHER_POLICY_SKIP,
+ PUBLISHER_POLICY_NEW
}
/**
* <p> Connector data listener functions </p>
More information about the openrtm-commit
mailing list