Index: /trunk/FACT++/src/dataLogger.cc
===================================================================
--- /trunk/FACT++/src/dataLogger.cc	(revision 10931)
+++ /trunk/FACT++/src/dataLogger.cc	(revision 10932)
@@ -537,10 +537,10 @@
 void DataLogger::AddService(const string& server, const string& service, const string&, bool isCmd)
 {
+         //dataLogger does not subscribe to commands
+    if (isCmd)
+        return;
+
     //check the given subscription against black and white lists
     if (!ShouldSubscribe(server, service))
-        return;
-
-         //dataLogger does not subscribe to commands
-    if (isCmd)
         return;
 
@@ -672,7 +672,7 @@
         return false;
 
-    if (((fBlackList.find(server + "/") != fBlackList.end()) ||
+    if ((fBlackList.find(server + "/") != fBlackList.end()) ||
          (fBlackList.find(server + "/" + service) != fBlackList.end()) ||
-         (fBlackList.find("/" + service) != fBlackList.end())))
+         (fBlackList.find("/" + service) != fBlackList.end()))
         return false;
 
@@ -691,8 +691,8 @@
        ostringstream str;
        //calculate time suitable for naming files.
-       Time fTime(time-boost::posix_time::time_duration(12,0,0));
+       const Time ftime(time-boost::posix_time::time_duration(12,0,0));
 
        //output it
-       str << path << Time::fmt("/%Y/%m/%d") << fTime;
+       str << path << Time::fmt("/%Y/%m/%d") << ftime;
 
        //check if target directory exist
@@ -701,5 +701,5 @@
 
        //output base of file name
-       str << Time::fmt("/%Y_%m_%d") << fTime;
+       str << Time::fmt("/%Y_%m_%d") << ftime;
 
        //output service name