Commit 49c85a78 authored by Claes Sjofors's avatar Claes Sjofors

Bugfix in mh SelectListIsUpdated

parent 0d605b2d
...@@ -259,7 +259,6 @@ JNIEXPORT jobject JNICALL Java_jpwr_rt_Mh_outunitReceive ...@@ -259,7 +259,6 @@ JNIEXPORT jobject JNICALL Java_jpwr_rt_Mh_outunitReceive
jint jsts; jint jsts;
jobject return_obj; jobject return_obj;
pwrtStatus_id = (*env)->FindClass( env, "jpwr/rt/PwrtStatus"); pwrtStatus_id = (*env)->FindClass( env, "jpwr/rt/PwrtStatus");
if(pwrtStatus_id == NULL) if(pwrtStatus_id == NULL)
{ {
...@@ -287,6 +286,7 @@ JNIEXPORT jobject JNICALL Java_jpwr_rt_Mh_outunitReceive ...@@ -287,6 +286,7 @@ JNIEXPORT jobject JNICALL Java_jpwr_rt_Mh_outunitReceive
(*env)->DeleteLocalRef(env,pwrtStatus_id); (*env)->DeleteLocalRef(env,pwrtStatus_id);
return return_obj; return return_obj;
} }
......
...@@ -151,7 +151,7 @@ public class MhServer ...@@ -151,7 +151,7 @@ public class MhServer
cdhrMaxAlarms = gdh.getObjectInfoInt(maxAlarmsAttr); cdhrMaxAlarms = gdh.getObjectInfoInt(maxAlarmsAttr);
cdhrMaxEvents = gdh.getObjectInfoInt(maxEventsAttr); cdhrMaxEvents = gdh.getObjectInfoInt(maxEventsAttr);
cdhrMaxCon = gdh.getObjectInfoInt(maxConAttr); cdhrMaxCon = gdh.getObjectInfoInt(maxConAttr);
System.out.println( "MaxNoOfAlarms: " + cdhrString.str + " " + cdhrMaxAlarms.value + " " + cdhrMaxAlarms.evenSts()); // System.out.println( "MaxNoOfAlarms: " + cdhrString.str + " " + cdhrMaxAlarms.value + " " + cdhrMaxAlarms.evenSts());
if(cdhrMaxCon.evenSts()) if(cdhrMaxCon.evenSts())
{ {
return cdhrMaxCon.getSts(); return cdhrMaxCon.getSts();
......
...@@ -394,7 +394,7 @@ mh_OutunitReceive () ...@@ -394,7 +394,7 @@ mh_OutunitReceive ()
XDR xdrs; XDR xdrs;
/* If SelectListIsUpdated is set, the outunit will be updated */ /* If SelectListIsUpdated is set, the outunit will be updated */
if (l.type == mh_eOutunitType_Operator && *l.SelectListIsUpdated) if (l.type == mh_eOutunitType_Operator && l.SelectListIsUpdated && *l.SelectListIsUpdated)
{ {
*l.SelectListIsUpdated = 0; *l.SelectListIsUpdated = 0;
mh_OutunitUpdate(); mh_OutunitUpdate();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment