X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=source%2Fcore%2Foam%2FHandler.cpp;h=b797177d167f86a7618a5959272a33553b038ec6;hb=b9cb59210ce2a02d8246f1a9a1acfcfdcd892f3a;hp=51e790618f2dabddf49ebaac1a9275cd3ffaa83f;hpb=4e12ac57e93c052f716a6305ad8fc099c45899d1;p=anna.git

diff --git a/source/core/oam/Handler.cpp b/source/core/oam/Handler.cpp
index 51e7906..b797177 100644
--- a/source/core/oam/Handler.cpp
+++ b/source/core/oam/Handler.cpp
@@ -1,8 +1,8 @@
-// ANNA - Anna is Not 'N' Anymore
+// ANNA - Anna is Not Nothingness Anymore
 //
 // (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
 //
-// https://bitbucket.org/testillano/anna
+// http://redmine.teslayout.com/projects/anna-suite
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -14,7 +14,7 @@
 // copyright notice, this list of conditions and the following disclaimer
 // in the documentation and/or other materials provided with the
 // distribution.
-//     * Neither the name of Google Inc. nor the names of its
+//     *  Neither the name of the copyright holder nor the names of its
 // contributors may be used to endorse or promote products derived from
 // this software without specific prior written permission.
 //
@@ -37,13 +37,13 @@
 // Local
 #include <anna/core/oam/Module.hpp>
 #include <anna/core/oam/Handler.hpp>
+#include <anna/core/oam/CounterScope.hpp>
 #include <anna/core/functions.hpp>
 
 #include <anna/core/tracing/Logger.hpp>
 #include <anna/core/tracing/TraceWriter.hpp>
 #include <anna/core/tracing/TraceMethod.hpp>
 #include <anna/core/functions.hpp>
-#include <anna/core/oam/CounterManager.hpp>
 
 // Standard
 #include <stdarg.h>
@@ -114,8 +114,10 @@ const anna::oam::counter_data_t *anna::oam::Handler::counterEvent(const anna::oa
   std::string base = result ? result->Description : module->getDefaultInternalCounterDescription(type);
 
   // Count if registered
-  if(result)
-    anna::oam::CounterManager::instantiate().count(module->getActiveCounterScope()->getId(), result->Offset, amount);
+  if(result) {
+    anna::oam::CounterScope *nc_cs = const_cast <anna::oam::CounterScope*>(module->getActiveCounterScope());
+    nc_cs->increment(result->Offset, amount);
+  }
 
   LOGDEBUG
   (