2007-09-04 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libmisc/monitor/mon-monitor.c, libmisc/monitor/mon-object.c,
	libmisc/monitor/monitor.h: Merge minor parts of Thomas' improvements
	that are needed by osmonweb.

1 files changed, 9 insertions, 10 deletions

diff --git a/cpukit/libmisc/monitor/mon-monitor.c b/cpukit/libmisc/monitor/mon-monitor.c
index d7e1089703..b48a7777da 100644
--- a/cpukit/libmisc/monitor/mon-monitor.c
+++ b/cpukit/libmisc/monitor/mon-monitor.c
@@ -578,16 +578,15 @@ rtems_monitor_init(
     if (monitor_flags & RTEMS_MONITOR_GLOBAL)
         rtems_monitor_server_init(monitor_flags);
 
-    /*
-     * Start the monitor task itself
-     */
-
-    status = rtems_task_start(rtems_monitor_task_id,
-                              rtems_monitor_task,
-                              monitor_flags);
-    if (status != RTEMS_SUCCESSFUL)
-    {
+    if (!(monitor_flags & RTEMS_MONITOR_NOTASK)) {
+      /*
+       * Start the monitor task itself
+       */
+      status = rtems_task_start(
+        rtems_monitor_task_id, rtems_monitor_task, monitor_flags);
+      if (status != RTEMS_SUCCESSFUL) {
         rtems_error(status, "could not start monitor");
         return;
-    }
+      }
+   }
 }