Merge branch 'master' of robert@pwrcvs:/data1/git/pwr

java/changelog.txt

@@ -10,3 +10,4 @@
 080314 cs  jop       Bugfix in integer format conversion.
 080623 cs  rt        Password encryption class added.
 080623 cs  rt        Default privileges and system group fetched from Security object (DefaultWebPriv and WebSystemGroup).
+090129 cs  rt        GdhServer terminated with error status, not 0, is no WebHandler object was found.

java/jpwr/rt/src/GdhServer.java

@@ -255,7 +255,7 @@ public class GdhServer
     if(sts % 2 == 0)
     {
       errh.setStatus( 0);
-      return;
+      System.exit(0);
     }
 
     errh.setStatus( Errh.PWR__SRUN);

xtt/changelog.txt

@@ -114,4 +114,5 @@
 081128 cs  flow      Metric antialiased fonts.
 081128 cs  glow      Metric antialiased fonts, scalable texts, change of fonts for subgraphs.
 081130 cs  glow      Font can be set on node and group level for text and annotations.
-081130 cs  glow      Red error color is not affected by gradient property.
\ No newline at end of file
+081130 cs  glow      Red error color is not affected by gradient property.
+090128 cs  xtt       Bugfix in alarmlist acknowledge.
\ No newline at end of file

xtt/lib/xtt/src/xtt_ev.cpp

@@ -170,9 +170,11 @@ void Ev::eve_activate_ack_last()
 
   sts = ala->get_last_not_acked( &id);
   if ( EVEN(sts)) return;
+
+  mh_sEventId lid = *id;
   ala->ack( id);
   eve->ack( id);
-  mh_OutunitAck( id);
+  mh_OutunitAck( &lid);
 }
 
 void Ev::eve_activate_help()
@@ -281,9 +283,11 @@ void Ev::ack_last_prio( unsigned long type, unsigned long prio)
   sts = ala->get_last_not_acked_prio( &id, type, prio);
   if ( ODD(sts))
   {
+    mh_sEventId lid = *id;
+
     ala->ack( id);
     eve->ack( id);
-    mh_OutunitAck( id);
+    mh_OutunitAck( &lid);
   }
 }